#810 zipped NRT input files should be in a distinct directory to avoi…

…d being erased when the input archive is unzipped Signed-off-by: Dimitri Baron <[email protected]>
dynawo · Jan 23, 2025 · 830d8ab · 830d8ab
1 parent 84599e1
commit 830d8ab
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 3 deletions.
diff --git a/cmake/TestMain.cmake b/cmake/TestMain.cmake
@@ -8,7 +8,10 @@
 #
 
 if(${USE_ZIP} STREQUAL "YES")
-  execute_process(COMMAND zip -j res/${TEST_NAME}.zip res/TestIIDM_${TEST_NAME}.iidm res/config_${TEST_NAME}.json)
+  # clean-up : delete the zip archive and the previous unzipped files
+  execute_process(COMMAND rm -f res/${TEST_NAME}.zip res/TestIIDM_${TEST_NAME}.iidm res/config_${TEST_NAME}.json)
+
+  execute_process(COMMAND zip -j res/${TEST_NAME}.zip res/res_to_zip/TestIIDM_${TEST_NAME}.iidm res/res_to_zip/config_${TEST_NAME}.json)
   set(_command ${EXE} --network=TestIIDM_${TEST_NAME}.iidm --config=config_${TEST_NAME}.json --input-archive=res/${TEST_NAME}.zip)
 else()
   set(_command ${EXE} --network=res/TestIIDM_${TEST_NAME}.iidm --config=res/config_${TEST_NAME}.json)

diff --git a/cmake/TestMainNSA.cmake b/cmake/TestMainNSA.cmake
@@ -8,7 +8,10 @@
 #
 
 if(${USE_ZIP} STREQUAL "YES")
-  execute_process(COMMAND zip -j res/${TEST_NAME}.zip res/TestIIDM_${TEST_NAME}.iidm res/config_${TEST_NAME}.json res/contingencies_${TEST_NAME}.json)
+  # clean-up : delete the zip archive and the previous unzipped files
+  execute_process(COMMAND rm -f res/${TEST_NAME}.zip res/TestIIDM_${TEST_NAME}.iidm res/config_${TEST_NAME}.json res/contingencies_${TEST_NAME}.json)
+
+  execute_process(COMMAND zip -j res/${TEST_NAME}.zip res/res_to_zip/TestIIDM_${TEST_NAME}.iidm res/res_to_zip/config_${TEST_NAME}.json res/res_to_zip/contingencies_${TEST_NAME}.json)
   set(_dfl_cmd ${EXE} --network=TestIIDM_${TEST_NAME}.iidm --config=config_${TEST_NAME}.json --contingencies=contingencies_${TEST_NAME}.json --input-archive=res/${TEST_NAME}.zip --nsa)
 else()
   set(_dfl_cmd ${EXE} --network=res/TestIIDM_${TEST_NAME}.iidm --config=res/config_${TEST_NAME}.json --contingencies=res/contingencies_${TEST_NAME}.json --nsa)

diff --git a/cmake/TestMainSA.cmake b/cmake/TestMainSA.cmake
@@ -8,7 +8,10 @@
 #
 
 if(${USE_ZIP} STREQUAL "YES")
-  execute_process(COMMAND zip -j res/${TEST_NAME}.zip res/TestIIDM_${TEST_NAME}.iidm res/config_${TEST_NAME}.json res/contingencies_${TEST_NAME}.json)
+  # clean-up : delete the zip archive and the previous unzipped files
+  execute_process(COMMAND rm -f res/${TEST_NAME}.zip res/TestIIDM_${TEST_NAME}.iidm res/config_${TEST_NAME}.json res/contingencies_${TEST_NAME}.json)
+
+  execute_process(COMMAND zip -j res/${TEST_NAME}.zip res/res_to_zip/TestIIDM_${TEST_NAME}.iidm res/res_to_zip/config_${TEST_NAME}.json res/res_to_zip/contingencies_${TEST_NAME}.json)
   set(_dfl_cmd ${EXE} --network=TestIIDM_${TEST_NAME}.iidm --config=config_${TEST_NAME}.json --contingencies=contingencies_${TEST_NAME}.json --input-archive=res/${TEST_NAME}.zip)
 else ()
   set(_dfl_cmd ${EXE} --network=res/TestIIDM_${TEST_NAME}.iidm --config=res/config_${TEST_NAME}.json --contingencies=res/contingencies_${TEST_NAME}.json)

diff --git a/tests/main/res/TestIIDM_launch_archive.iidm → ...s/res_to_zip/TestIIDM_launch_archive.iidm b/tests/main/res/TestIIDM_launch_archive.iidm → ...s/res_to_zip/TestIIDM_launch_archive.iidm
diff --git a/tests/main/res/config_launch_archive.json → ...res/res_to_zip/config_launch_archive.json b/tests/main/res/config_launch_archive.json → ...res/res_to_zip/config_launch_archive.json
diff --git a/...ain_n_sa/res/TestIIDM_launch_archive.iidm → ...s/res_to_zip/TestIIDM_launch_archive.iidm b/...ain_n_sa/res/TestIIDM_launch_archive.iidm → ...s/res_to_zip/TestIIDM_launch_archive.iidm
diff --git a/.../main_n_sa/res/config_launch_archive.json → ...res/res_to_zip/config_launch_archive.json b/.../main_n_sa/res/config_launch_archive.json → ...res/res_to_zip/config_launch_archive.json
diff --git a/..._sa/res/contingencies_launch_archive.json → ..._to_zip/contingencies_launch_archive.json b/..._sa/res/contingencies_launch_archive.json → ..._to_zip/contingencies_launch_archive.json
diff --git a/.../main_sa/res/TestIIDM_launch_archive.iidm → ...s/res_to_zip/TestIIDM_launch_archive.iidm b/.../main_sa/res/TestIIDM_launch_archive.iidm → ...s/res_to_zip/TestIIDM_launch_archive.iidm
diff --git a/tests/main_sa/res/config_launch_archive.json → ...res/res_to_zip/config_launch_archive.json b/tests/main_sa/res/config_launch_archive.json → ...res/res_to_zip/config_launch_archive.json
diff --git a/..._sa/res/contingencies_launch_archive.json → ..._to_zip/contingencies_launch_archive.json b/..._sa/res/contingencies_launch_archive.json → ..._to_zip/contingencies_launch_archive.json