From 6208c5de8584f472f0154b260c8121ad828ad97d Mon Sep 17 00:00:00 2001 From: Charles Plessy Date: Wed, 10 Dec 2014 21:27:53 +0900 Subject: [PATCH] Moved back the autopkgtests in debian/tests --- debian/python-tests/.#run-unit-test | 1 - debian/python-tests/control | 3 --- debian/python3-tests/control | 3 --- debian/tests/control | 7 +++++++ debian/{python-tests => tests}/run-nose-tests | 0 debian/{python3-tests => tests}/run-nose3-tests | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) delete mode 120000 debian/python-tests/.#run-unit-test delete mode 100644 debian/python-tests/control delete mode 100644 debian/python3-tests/control create mode 100644 debian/tests/control rename debian/{python-tests => tests}/run-nose-tests (100%) mode change 100644 => 100755 rename debian/{python3-tests => tests}/run-nose3-tests (74%) diff --git a/debian/python-tests/.#run-unit-test b/debian/python-tests/.#run-unit-test deleted file mode 120000 index 3e0a2ee..0000000 --- a/debian/python-tests/.#run-unit-test +++ /dev/null @@ -1 +0,0 @@ -vagrant@debian.31577:1417164804 \ No newline at end of file diff --git a/debian/python-tests/control b/debian/python-tests/control deleted file mode 100644 index faf5cfc..0000000 --- a/debian/python-tests/control +++ /dev/null @@ -1,3 +0,0 @@ -Tests: run-nose-tests -Depends: @, python-nose, python-pysam-tests, samtools, make -Restrictions: allow-stderr diff --git a/debian/python3-tests/control b/debian/python3-tests/control deleted file mode 100644 index 58d8e4f..0000000 --- a/debian/python3-tests/control +++ /dev/null @@ -1,3 +0,0 @@ -Tests: run-nose3-tests -Depends: @, python3-nose, python3-pysam-tests, samtools, make -Restrictions: allow-stderr diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..5fe69b8 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,7 @@ +Tests: run-nose-tests +Depends: @, python-nose, python-pysam-tests, samtools, make +Restrictions: allow-stderr + +Tests: run-nose3-tests +Depends: @, python3-nose, python-pysam-tests, samtools, make +Restrictions: allow-stderr diff --git a/debian/python-tests/run-nose-tests b/debian/tests/run-nose-tests old mode 100644 new mode 100755 similarity index 100% rename from debian/python-tests/run-nose-tests rename to debian/tests/run-nose-tests diff --git a/debian/python3-tests/run-nose3-tests b/debian/tests/run-nose3-tests similarity index 74% rename from debian/python3-tests/run-nose3-tests rename to debian/tests/run-nose3-tests index 4943914..299a33a 100755 --- a/debian/python3-tests/run-nose3-tests +++ b/debian/tests/run-nose3-tests @@ -4,7 +4,7 @@ if [ "$ADTTMP" = "" ] ; then ADTTMP=`mktemp -d /tmp/python3-pysam-test.XXXXXX` fi cd $ADTTMP -cp -ra /usr/share/doc/python3-pysam/tests/* $ADTTMP +cp -ra /usr/share/doc/python-pysam/tests/* $ADTTMP nosetests3 --nocapture cd rm -rf $ADTTMP -- 2.30.2