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

we don't need to hardcode pair styles to skip specific tests, but use YAML file for it

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-04-20 14:53:44 -04:00
parent a959d65560
commit ae570c05d8
22 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
unittest/force-styles/test_pair_style.cpp
View File

@ -1188,21 +1188,6 @@ TEST(PairStyle, single)
GTEST_SKIP();
}
// The single function in EAM is different from what we assume
// here, therefore we have to skip testing those pair styles.
// Pair styles colloid and yukawa/colloid are also not compatible with this single tester
if ((test_config.pair_style.substr(0, 7) == "colloid") ||
(test_config.pair_style.substr(0, 14) == "yukawa/colloid") ||
(test_config.pair_style.substr(0, 3) == "dpd") ||
(test_config.pair_style.substr(0, 3) == "eam") ||
((test_config.pair_style.substr(0, 6) == "hybrid") &&
(test_config.pair_style.find("eam") != std::string::npos))) {
if (!verbose) ::testing::internal::CaptureStdout();
cleanup_lammps(lmp, test_config);
if (!verbose) ::testing::internal::GetCapturedStdout();
GTEST_SKIP();
}
// now start over
if (!verbose) ::testing::internal::CaptureStdout();