[med-svn] [salmon] 01/02: fix built time test in parallel builds

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository salmon.

commit 452ce5c63e2c0cfe5d39654a16119b6c77274693
Author: Sascha Steinbiss <satta at debian.org>
Date:   Sun Sep 11 13:02:57 2016 +0000

    fix built time test in parallel builds
---
 debian/changelog | 7 +++++++
 debian/rules     | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1bc5d5d..e4fdc24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+salmon (0.7.2+ds1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS by fixing parallel test runs.
+
+ -- Sascha Steinbiss <satta at debian.org>  Sat, 10 Sep 2016 22:45:30 +0000
+
 salmon (0.7.2+ds1-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/rules b/debian/rules
index aa27d73..6d8ceb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,10 @@ override_dh_auto_build:
 		--include=../../debian/salmon-$${option}-man-include \
 		> ../../debian/salmon-$${option}.1; done
 
+# tests may fail when run out of order or concurrently
+override_dh_auto_test:
+	DEB_BUILD_OPTIONS="parallel=1" dh_auto_test
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f include/RapMap*.h* \
@@ -55,7 +59,7 @@ override_dh_auto_clean:
 	      include/HitManager.hpp \
 	      include/JFRaw.hpp \
 	      include/SA*.hpp \
-              include/kseq.h \
+	      include/kseq.h \
 	      include/bit_*.h \
 	      include/rank9b.h \
 	      include/macros.h \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/salmon.git