This is an automated email from the git hooks/post-receive script. afif pushed a commit to branch master in repository kineticstools.
commit f0a8bc5d91188130d47f992aa9517a3fdf20e775 Author: Afif Elghraoui <[email protected]> Date: Sun Jan 15 15:09:33 2017 -0800 Update patches without undoing their effects Previous patch adjustment basically threw away the patches, which caused the test suite to fail by execution of tests for which data was unavailable. . Also switch the order of the verbose-testing and unavailable data patches to allow forwarding the former. --- ...activate-tests-requiring-unavailable-data.patch | 18 ++++++------- debian/patches/series | 2 +- debian/patches/verbose-testing.patch | 31 +++++++++++++++------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/debian/patches/deactivate-tests-requiring-unavailable-data.patch b/debian/patches/deactivate-tests-requiring-unavailable-data.patch index a0b5845..78f886d 100644 --- a/debian/patches/deactivate-tests-requiring-unavailable-data.patch +++ b/debian/patches/deactivate-tests-requiring-unavailable-data.patch @@ -1,15 +1,15 @@ Description: Don't execute tests that require unavailable data files -Author: Afif Elghraoui <[email protected]> +Author: Afif Elghraoui <[email protected]> Forwarded: not-needed -Last-Update: 2015-11-30 ---- a/Makefile -+++ b/Makefile -@@ -27,6 +27,8 @@ tests: cram-tests unit-tests extra-tests +Last-Update: 2017-01-15 +--- kineticstools.orig/Makefile ++++ kineticstools/Makefile +@@ -26,7 +26,7 @@ + tests: cram-tests unit-tests extra-tests cram-tests: - cram --xunit-file=cramtests.xml test/cram/*.t -+ # this was previously in the Debian packaging -+ # cram `ls test/cram/*.t | grep -v detection_bam` +- cram --verbose --xunit-file=cramtests.xml test/cram/*.t ++ cram --verbose --xunit-file=cramtests.xml `ls test/cram/*.t | grep -v detection_bam` long-tests: - cram test/cram/long_running/*.t + cram --verbose test/cram/long_running/*.t diff --git a/debian/patches/series b/debian/patches/series index f017932..430109d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ man-pages.patch tests-import.patch -deactivate-tests-requiring-unavailable-data.patch verbose-testing.patch +deactivate-tests-requiring-unavailable-data.patch compiled-extension.patch spelling.patch diff --git a/debian/patches/verbose-testing.patch b/debian/patches/verbose-testing.patch index 2a1369d..59d711a 100644 --- a/debian/patches/verbose-testing.patch +++ b/debian/patches/verbose-testing.patch @@ -1,15 +1,26 @@ Description: Make test execution verbose -Author: Afif Elghraoui <[email protected]> +Author: Afif Elghraoui <[email protected]> Forwarded: no -Last-Update: 2015-11-30 ---- a/Makefile -+++ b/Makefile -@@ -28,7 +28,7 @@ tests: cram-tests unit-tests extra-tests +Last-Update: 2017-01-15 +--- kineticstools.orig/Makefile ++++ kineticstools/Makefile +@@ -26,16 +26,16 @@ + tests: cram-tests unit-tests extra-tests + cram-tests: - cram --xunit-file=cramtests.xml test/cram/*.t - # this was previously in the Debian packaging -- # cram `ls test/cram/*.t | grep -v detection_bam` -+ # cram --verbose `ls test/cram/*.t | grep -v detection_bam` +- cram --xunit-file=cramtests.xml test/cram/*.t ++ cram --verbose --xunit-file=cramtests.xml test/cram/*.t long-tests: - cram test/cram/long_running/*.t +- cram test/cram/long_running/*.t ++ cram --verbose test/cram/long_running/*.t + + unit-tests: + nosetests -s -v --with-xunit test/*.py + + extra-tests: +- cram --xunit-file=cramtests-extra.xml test/cram/extra/*.t ++ cram --verbose --xunit-file=cramtests-extra.xml test/cram/extra/*.t + + pip-install: + @which pip > /dev/null -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/kineticstools.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
