[med-svn] r20500 - in trunk/packages/vsearch/trunk/debian: . tests

[Andreas Tille]

Author: tille
Date: 2015-11-14 19:13:08 +0000 (Sat, 14 Nov 2015)
New Revision: 20500

Modified:
   trunk/packages/vsearch/trunk/debian/rules
   trunk/packages/vsearch/trunk/debian/tests/run-unit-test
   trunk/packages/vsearch/trunk/debian/vsearch.docs
Log:
Fix autopkg issues


Modified: trunk/packages/vsearch/trunk/debian/rules
===================================================================
--- trunk/packages/vsearch/trunk/debian/rules	2015-11-14 18:38:25 UTC (rev 20499)
+++ trunk/packages/vsearch/trunk/debian/rules	2015-11-14 19:13:08 UTC (rev 20500)
@@ -4,8 +4,7 @@
 #export DH_VERBOSE=1
 
 pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-testdir := $(CURDIR)/debian/$(pkg)-data/usr/share/doc/$(pkg)/tests
-exampledir := $(CURDIR)/debian/$(pkg)-data/usr/share/doc/$(pkg)/examples
+docdir := $(CURDIR)/debian/$(pkg)/usr/share/doc/$(pkg)
 
 HOST:=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 ifeq ($(HOST),x86_64)
@@ -54,9 +53,6 @@
 override_dh_install:
 	dh_install
 	# tweak path tp vsearch binary in test scripts
-	mkdir -p $(testdir)/eval
-	for tst in eval/*.sh ; do sed 's?\.\./src/vsearch?/usr/bin/vsearch?' $${tst} > $(testdir)/$${tst} ; done
-	sed -i 's?#\(VSEARCH=/usr/bin/vsearch\)?\1?' $(testdir)/eval/eval.sh ; done
-	mkdir -p $(testdir)/test
-	for tst in test/*.sh ; do sed 's?\.\./src/vsearch?/usr/bin/vsearch?' $${tst} > $(testdir)/$${tst} ; done
+	mkdir -p $(docdir)/test
+	for tst in test/*.sh ; do sed 's?\.\./bin/vsearch?/usr/bin/vsearch?' $${tst} > $(docdir)/$${tst} ; done
 

Modified: trunk/packages/vsearch/trunk/debian/tests/run-unit-test
===================================================================
--- trunk/packages/vsearch/trunk/debian/tests/run-unit-test	2015-11-14 18:38:25 UTC (rev 20499)
+++ trunk/packages/vsearch/trunk/debian/tests/run-unit-test	2015-11-14 19:13:08 UTC (rev 20500)
@@ -10,13 +10,17 @@
 cd ${pkg}-test
 cp -a /usr/share/doc/${pkg}/test .
 VDATADIR=/usr/share/vsearch/data
+if [ ! -d ${VDATADIR} ] ; then
+    echo "You need to install vsearch-data package to run this test."
+    exit 1
+fi
+
 for datadir in `find ${VDATADIR} -type d | sed -e "s#${VDATADIR}/*##" -e "/^$/d"` ; do mkdir -p ../vsearch-data/${datadir} ; done
 for datafile in `find ${VDATADIR} -type f` ; do 
     ln -s ${datafile} `echo ${datafile} | sed -e "s#${VDATADIR}/#../vsearch-data/#"`
 done
 zcat ../vsearch-data/BioMarKs.fsa.gz > ../vsearch-data/BioMarKs.fsa
 cd test
-sed -i 's?../bin/vsearch?/usr/bin/vsearch?' *.sh
 for t in *.sh ; do
     bash $t v
 done

Modified: trunk/packages/vsearch/trunk/debian/vsearch.docs
===================================================================
--- trunk/packages/vsearch/trunk/debian/vsearch.docs	2015-11-14 18:38:25 UTC (rev 20499)
+++ trunk/packages/vsearch/trunk/debian/vsearch.docs	2015-11-14 19:13:08 UTC (rev 20500)
@@ -1,4 +1,3 @@
 *.html
 man/*.pdf
 debian/tests/run-unit-test
-test