From 24b5cd7dec5be22438beaf6aa36056b06e3d1e38 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sun, 12 Jul 2020 19:22:14 -0400 Subject: [PATCH] rename test programs to be consistent with the other programs in the unittest tree --- unittest/force-styles/CMakeLists.txt | 26 +++++++++---------- .../{angle_style.cpp => test_angle_style.cpp} | 0 .../{bond_style.cpp => test_bond_style.cpp} | 0 .../{pair_style.cpp => test_pair_style.cpp} | 0 4 files changed, 13 insertions(+), 13 deletions(-) rename unittest/force-styles/{angle_style.cpp => test_angle_style.cpp} (100%) rename unittest/force-styles/{bond_style.cpp => test_bond_style.cpp} (100%) rename unittest/force-styles/{pair_style.cpp => test_pair_style.cpp} (100%) diff --git a/unittest/force-styles/CMakeLists.txt b/unittest/force-styles/CMakeLists.txt index 2cb4c00df8..14a53f4e3e 100644 --- a/unittest/force-styles/CMakeLists.txt +++ b/unittest/force-styles/CMakeLists.txt @@ -30,10 +30,10 @@ target_link_libraries(test_error_stats PRIVATE GTest::GTestMain GTest::GTest) add_test(NAME ErrorStats COMMAND test_error_stats) # pair style tester -add_executable(pair_style pair_style.cpp) -target_link_libraries(pair_style PRIVATE lammps style_tests) +add_executable(test_pair_style test_pair_style.cpp) +target_link_libraries(test_pair_style PRIVATE lammps style_tests) if(FFT_SINGLE) - target_compile_definitions(pair_style PRIVATE -DFFT_SINGLE) + target_compile_definitions(test_pair_style PRIVATE -DFFT_SINGLE) endif() # tests for a molecular systems and related pair styles @@ -44,7 +44,7 @@ if (FFT_SINGLE) endif() foreach(TEST ${MOL_PAIR_TESTS}) string(REGEX REPLACE "^.*mol-pair-(.*)\.yaml" "MolPairStyle:\\1" TNAME ${TEST}) - add_test(NAME ${TNAME} COMMAND pair_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + add_test(NAME ${TNAME} COMMAND test_pair_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR}") endforeach() @@ -52,7 +52,7 @@ endforeach() file(GLOB ATOMIC_PAIR_TESTS LIST_DIRECTORIES false ${TEST_INPUT_FOLDER}/atomic-pair-*.yaml) foreach(TEST ${ATOMIC_PAIR_TESTS}) string(REGEX REPLACE "^.*atomic-pair-(.*)\.yaml" "AtomicPairStyle:\\1" TNAME ${TEST}) - add_test(NAME ${TNAME} COMMAND pair_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + add_test(NAME ${TNAME} COMMAND test_pair_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR}") endforeach() @@ -60,29 +60,29 @@ endforeach() file(GLOB MANYBODY_PAIR_TESTS LIST_DIRECTORIES false ${TEST_INPUT_FOLDER}/manybody-pair-*.yaml) foreach(TEST ${MANYBODY_PAIR_TESTS}) string(REGEX REPLACE "^.*manybody-pair-(.*)\.yaml" "ManybodyPairStyle:\\1" TNAME ${TEST}) - add_test(NAME ${TNAME} COMMAND pair_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + add_test(NAME ${TNAME} COMMAND test_pair_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR}") endforeach() # bond style tester -add_executable(bond_style bond_style.cpp) -target_link_libraries(bond_style PRIVATE lammps style_tests) +add_executable(test_bond_style test_bond_style.cpp) +target_link_libraries(test_bond_style PRIVATE lammps style_tests) file(GLOB BOND_TESTS LIST_DIRECTORIES false ${TEST_INPUT_FOLDER}/bond-*.yaml) foreach(TEST ${BOND_TESTS}) string(REGEX REPLACE "^.*bond-(.*)\.yaml" "BondStyle:\\1" TNAME ${TEST}) - add_test(NAME ${TNAME} COMMAND bond_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + add_test(NAME ${TNAME} COMMAND test_bond_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR}") endforeach() # angle style tester -add_executable(angle_style angle_style.cpp) -target_link_libraries(angle_style PRIVATE lammps style_tests) +add_executable(test_angle_style test_angle_style.cpp) +target_link_libraries(test_angle_style PRIVATE lammps style_tests) file(GLOB ANGLE_TESTS LIST_DIRECTORIES false ${TEST_INPUT_FOLDER}/angle-*.yaml) foreach(TEST ${ANGLE_TESTS}) string(REGEX REPLACE "^.*angle-(.*)\.yaml" "AngleStyle:\\1" TNAME ${TEST}) - add_test(NAME ${TNAME} COMMAND angle_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + add_test(NAME ${TNAME} COMMAND test_angle_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR}") endforeach() @@ -94,6 +94,6 @@ if (FFT_SINGLE) endif() foreach(TEST ${KSPACE_TESTS}) string(REGEX REPLACE "^.*kspace-(.*)\.yaml" "KSpaceStyle:\\1" TNAME ${TEST}) - add_test(NAME ${TNAME} COMMAND pair_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + add_test(NAME ${TNAME} COMMAND test_pair_style ${TEST} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set_tests_properties(${TNAME} PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR}") endforeach() diff --git a/unittest/force-styles/angle_style.cpp b/unittest/force-styles/test_angle_style.cpp similarity index 100% rename from unittest/force-styles/angle_style.cpp rename to unittest/force-styles/test_angle_style.cpp diff --git a/unittest/force-styles/bond_style.cpp b/unittest/force-styles/test_bond_style.cpp similarity index 100% rename from unittest/force-styles/bond_style.cpp rename to unittest/force-styles/test_bond_style.cpp diff --git a/unittest/force-styles/pair_style.cpp b/unittest/force-styles/test_pair_style.cpp similarity index 100% rename from unittest/force-styles/pair_style.cpp rename to unittest/force-styles/test_pair_style.cpp