[med-svn] r15349 - in trunk/packages/mafft/trunk/debian: . tests

[Charles Plessy]

Author: plessy
Date: 2013-11-30 08:05:54 +0000 (Sat, 30 Nov 2013)
New Revision: 15349

Modified:
   trunk/packages/mafft/trunk/debian/changelog
   trunk/packages/mafft/trunk/debian/tests/with-example-data
Log:
debian/tests/with-example-data: Don't write progress to stderr on success.

Closes: #728190
Thanks: Martin Pitt <martin.pitt at ubuntu.com>



Modified: trunk/packages/mafft/trunk/debian/changelog
===================================================================
--- trunk/packages/mafft/trunk/debian/changelog	2013-11-30 07:55:36 UTC (rev 15348)
+++ trunk/packages/mafft/trunk/debian/changelog	2013-11-30 08:05:54 UTC (rev 15349)
@@ -1,3 +1,10 @@
+mafft (7.123-2) UNRELEASED; urgency=low
+
+  * debian/tests/with-example-data: Don't write progress to stderr on success.
+    Closes: #728190, thanks to Martin Pitt <martin.pitt at ubuntu.com>.
+
+ -- Charles Plessy <plessy at debian.org>  Sat, 30 Nov 2013 17:05:30 +0900
+
 mafft (7.123-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/packages/mafft/trunk/debian/tests/with-example-data
===================================================================
--- trunk/packages/mafft/trunk/debian/tests/with-example-data	2013-11-30 07:55:36 UTC (rev 15348)
+++ trunk/packages/mafft/trunk/debian/tests/with-example-data	2013-11-30 08:05:54 UTC (rev 15349)
@@ -3,9 +3,11 @@
 MAFFT="mafft --thread 0"
 TESTDATADIR=/usr/share/doc/mafft/test/
 
-$MAFFT                               $TESTDATADIR/sample | diff $TESTDATADIR/sample.fftns2 -
-$MAFFT --maxiterate 100              $TESTDATADIR/sample | diff $TESTDATADIR/sample.fftnsi -
-$MAFFT --globalpair                  $TESTDATADIR/sample | diff $TESTDATADIR/sample.gins1 -
-$MAFFT --globalpair --maxiterate 100 $TESTDATADIR/sample | diff $TESTDATADIR/sample.ginsi -
-$MAFFT --localpair                   $TESTDATADIR/sample | diff $TESTDATADIR/sample.lins1 -
-$MAFFT --localpair --maxiterate 100  $TESTDATADIR/sample | diff $TESTDATADIR/sample.linsi -
+PF=$ADTTMP/progress
+
+$MAFFT --progress $PF                               $TESTDATADIR/sample | diff $TESTDATADIR/sample.fftns2 - || cat $PF >&2
+$MAFFT --progress $PF --maxiterate 100              $TESTDATADIR/sample | diff $TESTDATADIR/sample.fftnsi - || cat $PF >&2
+$MAFFT --progress $PF --globalpair                  $TESTDATADIR/sample | diff $TESTDATADIR/sample.gins1 - || cat $PF >&2
+$MAFFT --progress $PF --globalpair --maxiterate 100 $TESTDATADIR/sample | diff $TESTDATADIR/sample.ginsi - || cat $PF >&2
+$MAFFT --progress $PF --localpair                   $TESTDATADIR/sample | diff $TESTDATADIR/sample.lins1 - || cat $PF >&2
+$MAFFT --progress $PF --localpair --maxiterate 100  $TESTDATADIR/sample | diff $TESTDATADIR/sample.linsi - || cat $PF >&2