test cleanup

virtualcell · Jul 28, 2024 · e353c11 · e353c11
1 parent c8b31db
commit e353c11
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,5 @@
 
 .DS_Store
 
-NFsim_v1.11/tests/data/SimID_273069657_0_.gdat
-
-NFsim_v1.11/tests/data/SimID_273069657_0_.species
+NFsim_v1.11/tests/smoke/SimID_273069657_0_.gdat
+NFsim_v1.11/tests/smoke/SimID_273069657_0_.species
diff --git a/NFsim_v1.11/CMakeLists.txt b/NFsim_v1.11/CMakeLists.txt
@@ -101,13 +101,13 @@ else (MINGW)
     set(test_nfsim_exe ${CMAKE_BINARY_DIR}/bin/${exe_target})
     set(python_cmd python3)
 endif (MINGW)
-set(test_dir ${CMAKE_CURRENT_SOURCE_DIR}/tests/test1)
+set(test_dir ${CMAKE_CURRENT_SOURCE_DIR}/tests/smoke)
 
 # smoke test as a python script
-add_test(NAME ${exe_target}_test1 COMMAND ${python_cmd} ${test_dir}/test1.py ${test_nfsim_exe} WORKING_DIRECTORY ${test_dir})
+add_test(NAME ${exe_target}_smoke_python COMMAND ${python_cmd} ${test_dir}/smoke.py ${test_nfsim_exe} WORKING_DIRECTORY ${test_dir})
 
 # smoke test as a bash script
-add_test(NAME ${exe_target}_test2 COMMAND bash -c "${test_dir}/test2.sh ${test_nfsim_exe}" WORKING_DIRECTORY ${test_dir})
+add_test(NAME ${exe_target}_smoke_bash COMMAND bash -c "${test_dir}/smoke.sh ${test_nfsim_exe}" WORKING_DIRECTORY ${test_dir})
 
 install(TARGETS ${exe_target} RUNTIME DESTINATION ${OPTION_EXE_DIRECTORY})
 
diff --git a/...sts/data/SimID_273069657_0_.gdat.expected → ...ts/smoke/SimID_273069657_0_.gdat.expected b/...sts/data/SimID_273069657_0_.gdat.expected → ...ts/smoke/SimID_273069657_0_.gdat.expected
diff --git a/...tests/test1/SimID_273069657_0_.nfsimInput → ...tests/smoke/SimID_273069657_0_.nfsimInput b/...tests/test1/SimID_273069657_0_.nfsimInput → ...tests/smoke/SimID_273069657_0_.nfsimInput
diff --git a/.../data/SimID_273069657_0_.species.expected → ...smoke/SimID_273069657_0_.species.expected b/.../data/SimID_273069657_0_.species.expected → ...smoke/SimID_273069657_0_.species.expected
diff --git a/NFsim_v1.11/tests/test1/test1.py → NFsim_v1.11/tests/smoke/smoke.py b/NFsim_v1.11/tests/test1/test1.py → NFsim_v1.11/tests/smoke/smoke.py
diff --git a/NFsim_v1.11/tests/test1/test2.sh → NFsim_v1.11/tests/smoke/smoke.sh b/NFsim_v1.11/tests/test1/test2.sh → NFsim_v1.11/tests/smoke/smoke.sh
diff --git a/NFsim_v1.11/tests/test1/SimID_273069657_0_.gdat.expected b/NFsim_v1.11/tests/test1/SimID_273069657_0_.gdat.expected
diff --git a/NFsim_v1.11/tests/test1/SimID_273069657_0_.species.expected b/NFsim_v1.11/tests/test1/SimID_273069657_0_.species.expected