[med-svn] r22805 - trunk/packages/python-cogent/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-09-15 13:15:58 +0000 (Thu, 15 Sep 2016)
New Revision: 22805

Modified:
   trunk/packages/python-cogent/trunk/debian/changelog
   trunk/packages/python-cogent/trunk/debian/rules
Log:
Need to exclude further tests on armhf and mips


Modified: trunk/packages/python-cogent/trunk/debian/changelog
===================================================================
--- trunk/packages/python-cogent/trunk/debian/changelog	2016-09-15 07:39:34 UTC (rev 22804)
+++ trunk/packages/python-cogent/trunk/debian/changelog	2016-09-15 13:15:58 UTC (rev 22805)
@@ -1,3 +1,9 @@
+python-cogent (1.9-4) unstable; urgency=medium
+
+  * Need to exclude further tests on armhf and mips
+
+ -- Andreas Tille <tille at debian.org>  Thu, 15 Sep 2016 10:45:44 +0200
+
 python-cogent (1.9-3) unstable; urgency=medium
 
   * (Build-)Depends python-matplotlib

Modified: trunk/packages/python-cogent/trunk/debian/rules
===================================================================
--- trunk/packages/python-cogent/trunk/debian/rules	2016-09-15 07:39:34 UTC (rev 22804)
+++ trunk/packages/python-cogent/trunk/debian/rules	2016-09-15 13:15:58 UTC (rev 22805)
@@ -16,6 +16,7 @@
                 test_clustalw \
                 test_mafft \
                 test_unifrac \
+                test_seqsim.test_analysis \
                 test_seqsim.test_usage
 
 ONLYAMD64_TESTS := test_bwa
@@ -24,21 +25,19 @@
 # We need to decide between not shipping cogent there or hiding
 # our eyes from these failures.  See README.source for further
 # explanation.
-FAIL_ON_ARMEL_TESTS := test_core.test_profile \
-                       test_seqsim.test_analysis
+FAIL_ON_ARMEL_TESTS := test_core.test_profile
+                       
 
-FAIL_ON_PPC64_MIPS64EL := test_core.test_tree \
-                       test_seqsim.test_analysis
+FAIL_ON_PPC64_MIPS64EL := test_core.test_tree
 
 FAIL_ON_I386_TESTS := test_maths.test_stats.test_test \
-                      test_seqsim.test_sequence_generators \
-                      test_seqsim.test_analysis
+                      test_seqsim.test_sequence_generators
 
 FAIL_ON_PPC64_TESTS := test_app.test_util
 
 FAIL_ON_S390X_TESTS := test_maths.test_optimisers
 
-FAIL_ON_KFREEBSD_AMD64_TESTS := test_seqsim.test_analysis
+FAIL_ON_MIPS_TESTS := test_seqsim.test_sequence_generators
 
 export PYBUILD_NAME=cogent
 PKG := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
@@ -97,13 +96,13 @@
 ifeq ($(BUILDARCH),s390x)
 	for tst in $(FAIL_ON_S390X_TESTS) ; do sed -i "/$${tst}/d" tests/alltests.py ; done
 endif
+ifeq ($(BUILDARCH),mips)
+	for tst in $(FAIL_ON_MIPS_TESTS) ; do sed -i "/$${tst}/d" tests/alltests.py ; done
+endif
 ifeq ($(BUILDARCH),$(filter $(BUILDARCH), i386 kfreebsd-i386))
 	for tst in $(FAIL_ON_I386_TESTS) ; do sed -i "/$${tst}/d" tests/alltests.py ; done
 endif
-ifeq ($(BUILDARCH),$(filter $(BUILDARCH), kfreebsd-amd64))
-	for tst in $(FAIL_ON_KFREEBSD_AMD64_TESTS) ; do sed -i "/$${tst}/d" tests/alltests.py ; done
 endif
-endif
 	BLASTMAT=/usr/share/ncbi/data/ RDP_JAR_PATH=/usr/share/java/rdp_classifier.jar $(CURDIR)/run_tests # --debug
 	# restore original tests file
 	mv tests/alltests.py~ tests/alltests.py