From 6fa3e6d23e8632478ae93b4b01ee4d1d07132ed0 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Mon, 1 Mar 2021 21:44:41 -0500 Subject: [PATCH] remove hardcoded checks for incompatible styles. use skip_tests keyword instead --- unittest/force-styles/test_pair_style.cpp | 26 ----------------------- 1 file changed, 26 deletions(-) diff --git a/unittest/force-styles/test_pair_style.cpp b/unittest/force-styles/test_pair_style.cpp index 6a99fb72cd..79f832c0ef 100644 --- a/unittest/force-styles/test_pair_style.cpp +++ b/unittest/force-styles/test_pair_style.cpp @@ -627,14 +627,6 @@ TEST(PairStyle, omp) EXPECT_THAT(output, StartsWith("LAMMPS (")); EXPECT_THAT(output, HasSubstr("Loop time")); - if (utils::strmatch(test_config.pair_style, "^dpd")) { - std::cerr << "Skipping pair style " << lmp->force->pair_style << "\n"; - if (!verbose) ::testing::internal::CaptureStdout(); - cleanup_lammps(lmp, test_config); - if (!verbose) ::testing::internal::GetCapturedStdout(); - GTEST_SKIP(); - } - // abort if running in parallel and not all atoms are local const int nlocal = lmp->atom->nlocal; ASSERT_EQ(lmp->atom->natoms, nlocal); @@ -930,24 +922,6 @@ TEST(PairStyle, intel) GTEST_SKIP(); } - if ((test_config.pair_style == "rebo") - || utils::strmatch(test_config.pair_style, "^dpd") - || utils::strmatch(test_config.pair_style, "^tersoff.* shift ")) { - std::cerr << "Skipping pair style " << lmp->force->pair_style << "\n"; - if (!verbose) ::testing::internal::CaptureStdout(); - cleanup_lammps(lmp, test_config); - if (!verbose) ::testing::internal::GetCapturedStdout(); - GTEST_SKIP(); - } - - if (lmp->force->kspace && utils::strmatch(lmp->force->kspace_style, "^pppm/disp/intel")) { - if (!verbose) ::testing::internal::CaptureStdout(); - cleanup_lammps(lmp, test_config); - if (!verbose) ::testing::internal::GetCapturedStdout(); - std::cerr << "Skipping kspace style pppm/disp/intel\n"; - GTEST_SKIP(); - } - // relax error a bit for USER-INTEL package double epsilon = 7.5 * test_config.epsilon; // relax test precision when using pppm and single precision FFTs