Merge branch 'release-2019' into master

[alexxy/gromacs.git] / src / gromacs / ewald / tests / testhardwarecontexts.cpp

diff --git a/src/gromacs/ewald/tests/testhardwarecontexts.cpp b/src/gromacs/ewald/tests/testhardwarecontexts.cpp
index 6157cd3dd1bc251fe7a692e58c5800ba70865aab..e15c37c3a1f1c2eae738e2b2f7fd84c77d6e1682 100644 (file)
--- a/src/gromacs/ewald/tests/testhardwarecontexts.cpp
+++ b/src/gromacs/ewald/tests/testhardwarecontexts.cpp
@@ -113,7 +113,8 @@ void PmeTestEnvironment::SetUp()
     hardwareContexts_.emplace_back(std::make_unique<TestHardwareContext>(CodePath::CPU, "", nullptr));
 
     hardwareInfo_ = hardwareInit();
-    if (!pme_gpu_supports_build(*hardwareInfo_, nullptr))
+    if (!pme_gpu_supports_build(nullptr) ||
+        !pme_gpu_supports_hardware(*hardwareInfo_, nullptr))
     {
         // PME can only run on the CPU, so don't make any more test contexts.
         return;