[silo-llnl] 78/96: Avoid calling make check in tools/silex

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit e9702d83c74754b887dcd4e5e67ec2b603a71bf2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 20:47:43 2014 +0100

    Avoid calling make check in tools/silex
---
 debian/rules | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index ce114e1..93ee780 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,15 +46,21 @@ override_dh_auto_configure:
 		LIBS=" -lQt5Core " LDFLAGS="$(LDFLAGS)" \
 		CPPFLAGS=" -I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets -I$(MPI_INC) $(CPPFLAGS)"  
 
+# Iterate over some directories to avoid stepping into tools/silex, which doesn't build.
 override_dh_auto_build:
 	for d in src tools/browser tools/silock ; do \
 		$(MAKE) -C $$d CC=$(CC) CXX=$(CXX) ; done
 	set -e ; for p in $(PYVERS)  ; do   \
-		$(MAKE) -C tools/python clean all CC=$(CC) CXX=$(CXX) PYTHON=$$p; \
+		$(MAKE) -C tools/python clean all check CC=$(CC) CXX=$(CXX) PYTHON=$$p; \
 		mkdir -p  debian/tmp/usr/lib/pyshared/$$p ;  \
 		cp tools/python/.libs/Silo.so debian/Silo.so.$$p  ; \
 	done
 
+# Need to avoid trying to building  tools/silex.
+override_dh_auto_test:
+	for d in src tools/browser tools/silock ; do \
+                $(MAKE) -C $$d check; done
+	
 override_dh_auto_install:
 	dh_auto_install
 	# move the python modules to where dh_pysupport will spot them ...
@@ -71,4 +77,4 @@ override_dh_auto_install:
 override_dh_auto_clean:
 	dh_clean
 	rm -f debian/Silo.so.* config.log
-	-( [ -f Makefile ] && make distclean)
+	( [ -f Makefile ] && make distclean || echo "No Makefile present ; skipping make distclean" )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git