refactor again

virtualcell · Jul 28, 2024 · 6406209 · 6406209
1 parent 0521118
commit 6406209
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/NFsim_v1.11/CMakeLists.txt b/NFsim_v1.11/CMakeLists.txt
@@ -94,15 +94,17 @@ enable_testing()
 add_executable(${exe_target} ${SRC_FILES})
 target_link_libraries(${exe_target} vcommons vcellmessaging)
 
-if (WIN32)
+if (MINGW)
+    set(test_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/tests/test1)
     set(test_nfsim_exe ${CMAKE_BINARY_DIR}/bin/${exe_target}.exe)
-    add_test(NAME ${exe_target}_test1 COMMAND py test1.py ${test_nfsim_exe} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/test1)
-    add_test(NAME ${exe_target}_test2 COMMAND bash -c "test2.sh ${test_nfsim_exe}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/test1)
-else (WIN32)
+    add_test(NAME ${exe_target}_test1 COMMAND py test1.py ${test_nfsim_exe} WORKING_DIRECTORY ${test_src_dir})
+    add_test(NAME ${exe_target}_test2 COMMAND bash -c ${test_src_dir}/test2.sh ${test_nfsim_exe} WORKING_DIRECTORY ${test_src_dir})
+else (MINGW)
+    set(test_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/tests/test1)
     set(test_nfsim_exe ${CMAKE_BINARY_DIR}/bin/${exe_target})
-    add_test(NAME ${exe_target}_test1 COMMAND ${test1_command} ${test_nfsim_exe} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/test1)
-    add_test(NAME ${exe_target}_test2 COMMAND bash -c "test2.sh ${test_nfsim_exe}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/test1)
-endif (WIN32)
+    add_test(NAME ${exe_target}_test1 COMMAND ${test_src_dir}/test1.py ${test_nfsim_exe} WORKING_DIRECTORY ${test_src_dir})
+    add_test(NAME ${exe_target}_test2 COMMAND ${test_src_dir}/test2.sh ${test_nfsim_exe} WORKING_DIRECTORY ${test_src_dir})
+endif (MINGW)
 
 install(TARGETS ${exe_target} RUNTIME DESTINATION ${OPTION_EXE_DIRECTORY})