remove fragile OpenMP thread checks

This commit is contained in:
Axel Kohlmeyer
2021-05-02 22:06:08 -04:00
parent 7e04c6933d
commit 16964e12bc

View File

@ -99,7 +99,6 @@ TEST_F(LAMMPS_plain, InitMembers)
EXPECT_STREQ(LAMMPS::git_branch, "(unknown)"); EXPECT_STREQ(LAMMPS::git_branch, "(unknown)");
EXPECT_STREQ(LAMMPS::git_descriptor, "(unknown)"); EXPECT_STREQ(LAMMPS::git_descriptor, "(unknown)");
} }
EXPECT_EQ(lmp->comm->nthreads, 1);
} }
TEST_F(LAMMPS_plain, TestStyles) TEST_F(LAMMPS_plain, TestStyles)
@ -234,9 +233,6 @@ TEST_F(LAMMPS_omp, InitMembers)
EXPECT_STREQ(LAMMPS::git_branch, "(unknown)"); EXPECT_STREQ(LAMMPS::git_branch, "(unknown)");
EXPECT_STREQ(LAMMPS::git_descriptor, "(unknown)"); EXPECT_STREQ(LAMMPS::git_descriptor, "(unknown)");
} }
#if 0 // temporarily disabled. MacOS behaves different from Linux here.
EXPECT_EQ(lmp->comm->nthreads, 2);
#endif
} }
// test fixture for Kokkos tests // test fixture for Kokkos tests
@ -326,7 +322,6 @@ TEST_F(LAMMPS_kokkos, InitMembers)
} }
} }
// check if Comm::nthreads is initialized to either 1 or 2 (from the previous tests)
TEST(LAMMPS_init, OpenMP) TEST(LAMMPS_init, OpenMP)
{ {
if (!LAMMPS::is_installed_pkg("USER-OMP")) GTEST_SKIP(); if (!LAMMPS::is_installed_pkg("USER-OMP")) GTEST_SKIP();