[med-svn] r7382 - trunk/packages/mafft/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2011-08-05 00:23:33 +0000 (Fri, 05 Aug 2011)
New Revision: 7382

Modified:
   trunk/packages/mafft/trunk/debian/changelog
   trunk/packages/mafft/trunk/debian/rules
Log:
Run the tests after installation, and allow them to fail.


Modified: trunk/packages/mafft/trunk/debian/changelog
===================================================================
--- trunk/packages/mafft/trunk/debian/changelog	2011-08-05 00:18:05 UTC (rev 7381)
+++ trunk/packages/mafft/trunk/debian/changelog	2011-08-05 00:23:33 UTC (rev 7382)
@@ -5,6 +5,7 @@
   * Removed extra manpage copies instead of patching Makefile and
     installing via debhleper (debian/patches, debian/rules, debian/manpages).
   * Removed debian/dirs, not needed anymore.
+  * Run the tests after installation, and allow them to fail (debian/rules).
 
  -- Charles Plessy <plessy at debian.org>  Fri, 05 Aug 2011 08:34:36 +0900
 

Modified: trunk/packages/mafft/trunk/debian/rules
===================================================================
--- trunk/packages/mafft/trunk/debian/rules	2011-08-05 00:18:05 UTC (rev 7381)
+++ trunk/packages/mafft/trunk/debian/rules	2011-08-05 00:23:33 UTC (rev 7382)
@@ -11,20 +11,20 @@
 override_dh_build:
 	$(MAKE) -C core PREFIX=/usr/lib/mafft
 
-MAFFT = MAFFT_BINARIES=$(CURDIR)/binaries scripts/mafft
-override_dh_auto_test:
-	-$(MAFFT) 				test/sample | diff test/sample.fftns2 -
-	-$(MAFFT) --maxiterate 100 		test/sample | diff test/sample.fftnsi -
-	-$(MAFFT) --globalpair 			test/sample | diff test/sample.gins1 -
-	-$(MAFFT) --globalpair --maxiterate 100	test/sample | diff test/sample.ginsi -
-	-$(MAFFT) --localpair			test/sample | diff test/sample.lins1 -
-	-$(MAFFT) --localpair --maxiterate 100	test/sample | diff test/sample.linsi -
-
 override_dh_clean:
 	[ ! -f core/Makefile ] || $(MAKE) -C core clean
 	rm -rf binaries/* scripts/*
 	dh_clean
 
+MAFFT = MAFFT_BINARIES=$(CURDIR)/binaries scripts/mafft
+
 override_dh_install:
 	$(MAKE) -C core PREFIX=$(CURDIR)/debian/mafft/usr/lib/mafft MANDIR=$(CURDIR)/debian/mafft/usr/share/man/man1 ENABLE_MULTITHREAD=-Denablemultithread LIBDIR=$(CURDIR)/debian/mafft/usr/lib/mafft/lib/mafft install
 	rm $(CURDIR)/debian/mafft/usr/lib/mafft/lib/mafft/*.1
+	# Testing Mafft…
+	$(MAFFT) 				test/sample | diff test/sample.fftns2 -
+	$(MAFFT) --maxiterate 100 		test/sample | diff test/sample.fftnsi -
+	$(MAFFT) --globalpair 			test/sample | diff test/sample.gins1 -
+	$(MAFFT) --globalpair --maxiterate 100	test/sample | diff test/sample.ginsi -
+	$(MAFFT) --localpair			test/sample | diff test/sample.lins1 -
+	$(MAFFT) --localpair --maxiterate 100	test/sample | diff test/sample.linsi -