From: Jorge Soares <j.s.soares@gmail.com>
Date: Fri, 28 Nov 2014 14:26:44 +0000 (+0000)
Subject: overriding autotest as there is nothing to test until pysam is installed. nose tests... 
X-Git-Tag: archive/raspbian/0.22.0+ds-1+rpi1~1^2^2~351
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0bcea417b6081c57c7814fad331793b399dd9a55;p=python-pysam.git

overriding autotest as there is nothing to test until pysam is installed. nose tests are now executables
---

diff --git a/debian/python-tests/run-nose-tests b/debian/python-tests/run-nose-tests
index 0d19351..2441b1d 100644
--- a/debian/python-tests/run-nose-tests
+++ b/debian/python-tests/run-nose-tests
@@ -5,4 +5,6 @@ if [ "$ADTTMP" = "" ] ; then
 fi
 cd $ADTTMP
 cp -a /usr/share/doc/python-pysam/tests/* $ADTTMP
-nosetesrs --nocapture
+nosetests --nocapture
+rm -rf $ADTTMP
+
diff --git a/debian/python3-tests/run-nose3-tests b/debian/python3-tests/run-nose3-tests
old mode 100644
new mode 100755
index e710ac5..85628ae
--- a/debian/python3-tests/run-nose3-tests
+++ b/debian/python3-tests/run-nose3-tests
@@ -6,3 +6,5 @@ fi
 cd $ADTTMP
 cp -a /usr/share/doc/python3-pysam/tests/* $ADTTMP
 nosetests3 --nocapture
+rm -rf $ADTTMP
+
diff --git a/debian/rules b/debian/rules
index 7cd5155..bad9787 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,44 +14,6 @@ export HTSLIB_INCLUDE_DIR=/usr/include
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
-#Make sure Cython is recreating some c-files.  To enable building twice in a
-#row these will be saved in advance and restored afterwards
-#debian/savefiles:
-#	if grep -q -l "Generated by Cython" pysam/*.c ; then \
-#	    mkdir -p debian/savefiles ; \
-#	    mv `grep -l "Generated by Cython" pysam/*.c` debian/savefiles ; \
-	fi
-
-#override_dh_auto_test:
-
-
-#override_dh_clean:
-#	dh_clean
-# restore cython generated files
-#	if [ -d debian/savefiles ] ; then \
-#	    mv debian/savefiles/* pysam ; \
-#	    rm -rf debian/savefiles ; \
-#	fi
-
-#override_dh_auto_build: debian/savefiles
-#	 dh_auto_build
-
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#	LC_ALL=C.UTF-8 dh_auto_test -- --test --system=custom \
-#		--test-args='set -e; \
-#			     cp -a $(CURDIR)/tests ${build_dir}/tests ; \
-#			     cd {build_dir}/tests PYTHONPATH=${build_dir} ${interpreter} ./pysam_test.py \
-#			                          && HTSLIB_LIBRARY_DIR=$(HTSLIBDIR) HTSLIB_INCLUDE_DIR=/usr/include PYTHONPATH=${build_dir} ${interpreter} ./tabix_test.py '
-#endif
-
-#override_dh_install-indep:
-#	dh_install -p $(TESTPKG)
-#	cd debian/$(TESTPKG)/usr/share/doc/python-pysam/tests; \
-#	    make clean; \
-#	    rm -f log.txt ; \
-#	    chmod a+x tabix_test.py
-#	cd debian/$(TESTPKG)/usr/share/doc/python3-pysam/tests; \
-#	    make clean; \
-#	    rm -f log.txt ; \
-#	    chmod a+x tabix_test.py
+override_dh_auto_test:
+#nothing to test until pysam is installed.
+#test packages are provided for both pithon versions