[med-svn] r16703 - in trunk/packages/staden-io-lib/trunk/debian: . tests

[Andreas Tille]

Author: tille
Date: 2014-04-14 20:50:46 +0000 (Mon, 14 Apr 2014)
New Revision: 16703

Modified:
   trunk/packages/staden-io-lib/trunk/debian/rules
   trunk/packages/staden-io-lib/trunk/debian/tests/run-unit-test
Log:
Fix autopkgtest


Modified: trunk/packages/staden-io-lib/trunk/debian/rules
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/rules	2014-04-14 15:58:57 UTC (rev 16702)
+++ trunk/packages/staden-io-lib/trunk/debian/rules	2014-04-14 20:50:46 UTC (rev 16703)
@@ -34,7 +34,7 @@
 	mkdir -p $(testdir)
         # fix path to staden-io-lib executable in examples
 	for tst in `ls tests/*.test` ; do \
-	    sed 's#$$top_builddir/progs/#/usr/bin/#' $${tst} > $(testdir)/`basename $${tst}` ; \
+	    sed -e 's#\.\./$$top_builddir/progs/#/usr/bin/#' -e 's#$$top_builddir/progs/#/usr/bin/#' $${tst} > $(testdir)/`basename $${tst}` ; \
 	done
 	# remove autogenerated big data files
 	rm -f $(testdir)/data/ce\#*sorted.sam

Modified: trunk/packages/staden-io-lib/trunk/debian/tests/run-unit-test
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/tests/run-unit-test	2014-04-14 15:58:57 UTC (rev 16702)
+++ trunk/packages/staden-io-lib/trunk/debian/tests/run-unit-test	2014-04-14 20:50:46 UTC (rev 16703)
@@ -7,12 +7,23 @@
 cp -a /usr/share/doc/staden-io-lib/test/* $ADTTMP
 gunzip data/*.gz
 
-TESTS=`ls *.test`
+#TESTS=`ls *.test`
+# The sequence of the tests plays some role to finish all of them successfully
+TESTS="srf2fasta.test
+       srf2fastq.test
+       srf_filter.test
+       srf_info.test
+       srf_index.test
+       scram.test
+       scram_mt.test
+      "
+
 OUTDIR=./test.out
 LOGFILE=`basename $0`.log
 
 mkdir -p $OUTDIR
 for tst in $TESTS ; do
-    srcdir=. outdir=$OUTDIR $tst > $LOGFILE
+    echo $tst >> $LOGFILE
+    srcdir=. outdir=$OUTDIR $tst 2>&1 | tee >> $LOGFILE 
 done