Commit b0e55803 authored by Nicholas Breen's avatar Nicholas Breen

Exchange patch from 2018.1-2 for a GTEST_FILTER exclusion in rules.

parent ba2f3c4e
gromacs (2018.1-3) unstable; urgency=medium
* Exchange patch from 2018.1-2 for a GTEST_FILTER exclusion in rules.
(Closes: #896194)
-- Nicholas Breen <nbreen@debian.org> Tue, 24 Apr 2018 20:01:16 -0700
gromacs (2018.1-2) unstable; urgency=medium
* patches/openmpi-disable-gputest.patch: bypass one test on OpenMPI builds
......
Description: Disable CUDA pinning test on OpenMPI build
Seems to be broken with OpenMPI 3 only.
Origin: vendor
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=896194
Forwarded: no
Last-Update: 2018-04-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: gromacs/src/gromacs/gpu_utils/tests/hostallocator.cpp
===================================================================
--- gromacs.orig/src/gromacs/gpu_utils/tests/hostallocator.cpp
+++ gromacs/src/gromacs/gpu_utils/tests/hostallocator.cpp
@@ -308,12 +308,14 @@ TYPED_TEST(HostAllocatorTest, ManualPinn
#else
+#if ! defined (OMPI_VERSION)
TYPED_TEST(HostAllocatorTest, ChangingPinningPolicyRequiresCuda)
{
typename TestFixture::VectorType input;
EXPECT_DEATH_IF_SUPPORTED(changePinningPolicy(&input, PinningPolicy::CanBePinned),
".*A suitable build of GROMACS.* is required.*");
}
+#endif // OMPI_VERSION
TYPED_TEST(HostAllocatorTest, ManualPinningOperationsWorkEvenWithoutCuda)
{
......@@ -5,4 +5,3 @@ doxygen.patch
disable-cpuinfotest.patch
hurd-disable-numa-test.patch
mdrun-test-timeout.patch
openmpi-disable-gputest.patch
......@@ -176,11 +176,13 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
(cd build/openmpi ; LD_LIBRARY_PATH=$(CURDIR)/build/openmpi/lib \
OMPI_MCA_plm_rsh_agent=/bin/false \
OMPI_MCA_rmaps_base_oversubscribe=1 \
GTEST_FILTER="-*ChangingPinningPolicyRequiresCuda" \
ctest -V)
$(MAKE) -C build/openmpi-dp tests
(cd build/openmpi-dp ; LD_LIBRARY_PATH=$(CURDIR)/build/openmpi-dp/lib \
OMPI_MCA_plm_rsh_agent=/bin/false \
OMPI_MCA_rmaps_base_oversubscribe=1 \
GTEST_FILTER="-*ChangingPinningPolicyRequiresCuda" \
ctest -V)
endif
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment