ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make test environment consistent across all force tests

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-07-27 20:42:42 -04:00
parent a3775f785a
commit a5d0efcd5b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
unittest/force-styles/CMakeLists.txt
View File

@ -204,11 +204,7 @@ foreach(TEST ${FIX_TIMESTEP_TESTS})
continue() continue()
endif() endif()
add_test(NAME ${TNAME} COMMAND test_fix_timestep ${TEST}) add_test(NAME ${TNAME} COMMAND test_fix_timestep ${TEST})
if(WIN32) set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "${FORCE_TEST_ENVIRONMENT}")
set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};PYTHONPATH=${TEST_INPUT_FOLDER}\\\;${LAMMPS_PYTHON_DIR}")
else()
set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};PYTHONPATH=${TEST_INPUT_FOLDER}:${LAMMPS_PYTHON_DIR}:$ENV{PYTHONPATH};PYTHONDONTWRITEBYTECODE=1")
endif()
set_tests_properties(${TNAME} PROPERTIES LABELS "${TEST_TAGS}") set_tests_properties(${TNAME} PROPERTIES LABELS "${TEST_TAGS}")
endforeach() endforeach()
@ -225,7 +221,7 @@ foreach(TEST ${DIHEDRAL_TESTS})
continue() continue()
endif() endif()
add_test(NAME ${TNAME} COMMAND test_dihedral_style ${TEST}) add_test(NAME ${TNAME} COMMAND test_dihedral_style ${TEST})
set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};PYTHONPATH=${TEST_INPUT_FOLDER}:$ENV{PYTHONPATH};PYTHONDONTWRITEBYTECODE=1") set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "${FORCE_TEST_ENVIRONMENT}")
set_tests_properties(${TNAME} PROPERTIES LABELS "${TEST_TAGS}") set_tests_properties(${TNAME} PROPERTIES LABELS "${TEST_TAGS}")
endforeach() endforeach()
@ -242,7 +238,7 @@ foreach(TEST ${IMPROPER_TESTS})
continue() continue()
endif() endif()
add_test(NAME ${TNAME} COMMAND test_improper_style ${TEST}) add_test(NAME ${TNAME} COMMAND test_improper_style ${TEST})
set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};PYTHONPATH=${TEST_INPUT_FOLDER}:$ENV{PYTHONPATH};PYTHONDONTWRITEBYTECODE=1") set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "${FORCE_TEST_ENVIRONMENT}")
set_tests_properties(${TNAME} PROPERTIES LABELS "${TEST_TAGS}") set_tests_properties(${TNAME} PROPERTIES LABELS "${TEST_TAGS}")
endforeach() endforeach()
@ -250,7 +246,7 @@ if(MLIAP_ENABLE_PYTHON AND (NOT WIN32))
add_executable(test_mliappy_unified test_mliappy_unified.cpp) add_executable(test_mliappy_unified test_mliappy_unified.cpp)
target_link_libraries(test_mliappy_unified PRIVATE lammps GTest::GMockMain) target_link_libraries(test_mliappy_unified PRIVATE lammps GTest::GMockMain)
add_test(NAME TestMliapPyUnified COMMAND test_mliappy_unified) add_test(NAME TestMliapPyUnified COMMAND test_mliappy_unified)
set_tests_properties(TestMliapPyUnified PROPERTIES ENVIRONMENT "PYTHONPATH=${LAMMPS_PYTHON_DIR};PYTHONDONTWRITEBYTECODE=1") set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "${FORCE_TEST_ENVIRONMENT}")
endif() endif()
add_executable(test_pair_list test_pair_list.cpp) add_executable(test_pair_list test_pair_list.cpp)