[dune-grid-glue] 05/06: Enable tests, except for the broken ones.

[Ansgar Burchardt]

This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to annotated tag debian/2.4.20150723gd6e4c74-1
in repository dune-grid-glue.

commit a06e73435e85cdf0fedcfbf7e3916e4101260778
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Mon Sep 7 15:22:24 2015 +0200

    Enable tests, except for the broken ones.
---
 debian/patches/0001-Add-MPI-library.patch      | 24 ++++++++++++++++++++++++
 debian/patches/0002-Add-psurface-library.patch | 19 +++++++++++++++++++
 debian/patches/disable-broken-tests.patch      | 20 ++++++++++++++++++++
 debian/patches/series                          |  3 +++
 debian/rules                                   |  3 ---
 5 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0001-Add-MPI-library.patch b/debian/patches/0001-Add-MPI-library.patch
new file mode 100644
index 0000000..ce296c1
--- /dev/null
+++ b/debian/patches/0001-Add-MPI-library.patch
@@ -0,0 +1,24 @@
+From 631d5a0efddd83282046c71fef9af3e6935ec6ca Mon Sep 17 00:00:00 2001
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Mon, 7 Sep 2015 15:02:34 +0200
+Subject: [PATCH 1/2] Add MPI library
+
+Otherwise compiling the test fails with
+
+  /usr/bin/ld: nonoverlappingcouplingtest_mpi-nonoverlappingcouplingtest.o: undefined reference to symbol 'MPI_Waitany'
+  //usr/lib/libmpi.so.1: error adding symbols: DSO missing from command line
+  collect2: error: ld returned 1 exit status
+---
+ dune/grid-glue/test/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/dune/grid-glue/test/Makefile.am
++++ b/dune/grid-glue/test/Makefile.am
+@@ -38,6 +38,7 @@
+ nonoverlappingcouplingtest_mpi_SOURCES = nonoverlappingcouplingtest.cc
+ nonoverlappingcouplingtest_mpi_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS) -DWRITE_TO_VTK
+ nonoverlappingcouplingtest_mpi_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
++nonoverlappingcouplingtest_mpi_LDADD = $(LDADD) $(DUNEMPILIBS)
+ endif
+ mixeddimcouplingtest_SOURCES = mixeddimcouplingtest.cc
+ mixeddimoverlappingtest_SOURCES = mixeddimoverlappingtest.cc
diff --git a/debian/patches/0002-Add-psurface-library.patch b/debian/patches/0002-Add-psurface-library.patch
new file mode 100644
index 0000000..6785261
--- /dev/null
+++ b/debian/patches/0002-Add-psurface-library.patch
@@ -0,0 +1,19 @@
+From 17ae48cc27975a113b1d721f7e661f47a99f78ca Mon Sep 17 00:00:00 2001
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Mon, 7 Sep 2015 15:16:09 +0200
+Subject: [PATCH 2/2] Add psurface library.
+
+---
+ dune/grid-glue/test/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/dune/grid-glue/test/Makefile.am
++++ b/dune/grid-glue/test/Makefile.am
+@@ -21,6 +21,7 @@
+ 
+ AM_CPPFLAGS += $(PSURFACE_CPPFLAGS)
+ AM_LDFLAGS  += $(PSURFACE_LDFLAGS) $(AMIRAMESH_LDFLAGS)
++LDADD       += $(PSURFACE_LIBS)
+ 
+ # If UG is available we can test pyramids and prisms
+ AM_CPPFLAGS += $(UG_CPPFLAGS)
diff --git a/debian/patches/disable-broken-tests.patch b/debian/patches/disable-broken-tests.patch
new file mode 100644
index 0000000..be05d7c
--- /dev/null
+++ b/debian/patches/disable-broken-tests.patch
@@ -0,0 +1,20 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Subject: Disable broken tests
+
+overlappingcouplingtest:
+  requires tests from dune-grid not included in the package
+--- a/dune/grid-glue/test/Makefile.am
++++ b/dune/grid-glue/test/Makefile.am
+@@ -2,11 +2,9 @@
+ 
+ TESTPROGS = \
+     callmergertwicetest        \
+-    mixeddimcouplingtest       \
+     mixeddimoverlappingtest    \
+     multivectortest            \
+-    nonoverlappingcouplingtest \
+-    overlappingcouplingtest
++    nonoverlappingcouplingtest
+ 
+ if MPI
+ TESTPROGS += nonoverlappingcouplingtest_mpi
diff --git a/debian/patches/series b/debian/patches/series
index 4db24c4..e9e38ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 soname.patch
+disable-broken-tests.patch
+0001-Add-MPI-library.patch
+0002-Add-psurface-library.patch
diff --git a/debian/rules b/debian/rules
index 33f3734..0ebe49f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,5 @@ include /usr/share/dune/dune-debian.mk
 %:
 	dh $@ --parallel
 
-override_dh_auto_test:
-	# skip tests for now
-
 override_dh_strip:
 	dh_strip --dbg-package=libdune-grid-glue-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-grid-glue.git