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

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

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();

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:59 2021
epsilon: 5e-14
skip_tests: single
prerequisites: ! |
pair colloid
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:59 2021
epsilon: 5e-14
skip_tests: single
prerequisites: ! |
pair colloid
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:59 2021
epsilon: 5e-13
skip_tests: single
prerequisites: ! |
pair colloid
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:59 2021
epsilon: 5e-14
skip_tests: single
prerequisites: ! |
pair colloid
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:59 2021
epsilon: 5e-13
skip_tests: single
prerequisites: ! |
pair colloid
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:00 2021
epsilon: 6e-12
skip_tests: single
prerequisites: ! |
pair eam
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:00 2021
epsilon: 5e-12
skip_tests: single
prerequisites: ! |
pair eam/alloy
pre_commands: ! ""

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:00 2021
epsilon: 7.5e-12
skip_tests: single
prerequisites: ! |
pair eam/alloy
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:00 2021
epsilon: 5e-12
skip_tests: single
prerequisites: ! |
pair eam/cd
pre_commands: ! ""

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:00 2021
epsilon: 5e-12
skip_tests: single
prerequisites: ! |
pair eam/cd/old
pre_commands: ! ""

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:00 2021
epsilon: 5e-12
skip_tests: single
prerequisites: ! |
pair eam/cd
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:01 2021
epsilon: 5e-12
skip_tests: single
prerequisites: ! |
pair eam/fs
pre_commands: ! ""

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:01 2021
epsilon: 7.5e-12
skip_tests: single
prerequisites: ! |
pair eam/fs
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:01 2021
epsilon: 5e-12
skip_tests: single
prerequisites: ! |
pair eam/he
pre_commands: ! ""

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:02 2021
epsilon: 7.5e-12
skip_tests: single
prerequisites: ! |
pair eam/he
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:02 2021
epsilon: 5e-12
skip_tests: single
prerequisites: ! |
pair eam
pre_commands: ! |

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:02 2021
epsilon: 1e-11
skip_tests: single
prerequisites: ! |
pair eam/fs
pre_commands: ! ""

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:03 2021
epsilon: 5e-12
skip_tests: single
prerequisites: ! |
pair eam/fs
pre_commands: ! ""

View File

@ -2,6 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:10 2021
epsilon: 5e-14
skip_tests: single
prerequisites: ! |
atom sphere
pair yukawa/colloid

View File

@ -2,7 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:44 2021
epsilon: 5e-14
skip_tests: gpu intel
skip_tests: gpu intel single
prerequisites: ! |
atom full
pair dpd

View File

@ -2,7 +2,7 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:44 2021
epsilon: 5e-14
skip_tests: gpu intel
skip_tests: gpu intel single
prerequisites: ! |
atom full
pair dpd/tstat