This is an automated email from the git hooks/post-receive script.
periapt pushed a commit to branch master
in repository devscripts.
commit fb025fa5e044dc8164b0420273efbc0a63ddbb52
Author: Nicholas Bamber <nicho...@periapt.co.uk>
Date: Sun Dec 6 10:53:47 2015 +0000
move skip test into script and do not rely on shell string comparison for
comparing versions
---
test/Makefile | 13 ++-----------
test/test_licensecheck_SL | 7 ++++++-
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/test/Makefile b/test/Makefile
index 8bbce57..f3ca3a3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,8 +1,3 @@
-# libsoftware-license-perl to be newer than 0.103010-3
-check_unstable = $(shell dpkg --compare-versions \
- `dpkg-query -W -f='$${Version}' libsoftware-license-perl` \
- gt '0.103010-3' ; \
- echo $$?)
test:
./test_annotate-output
@@ -12,9 +7,7 @@ test:
./test_package_lifecycle
./test_debdiff
./test_licensecheck
- if [ $(check_unstable) = 0 ]; then \
- ./test_licensecheck_SL ;\
- fi
+ ./test_licensecheck_SL
./test_uscan
./test_uscan_mangle
./test_mk-origtargz
@@ -27,9 +20,7 @@ test-installed:
./test_package_lifecycle --installed
./test_debdiff --installed
./test_licensecheck --installed
- if [ $(check_unstable) = 0 ]; then \
- ./test_licensecheck_SL --installed ;\
- fi
+ ./test_licensecheck_SL --installed
./test_uscan --installed
./test_uscan_mangle --installed
./test_mk-origtargz --installed
diff --git a/test/test_licensecheck_SL b/test/test_licensecheck_SL
index 7beb888..296249e 100755
--- a/test/test_licensecheck_SL
+++ b/test/test_licensecheck_SL
@@ -40,7 +40,12 @@ my %LICENSES = (
Perl_5=>'UNKNOWN',
);
-plan tests=>scalar(keys %LICENSES);
+my $SL_VERSION=`dpkg-query -W -f='\${Version}' libsoftware-license-perl`;
+if (system("dpkg --compare-versions $SL_VERSION gt 0.103010-3") == 0) {
+ plan tests=>scalar(keys %LICENSES);
+} else {
+ plan skip_all=>"Software::License $SL_VERSION too old for this test";
+}
my $dir = File::Temp->newdir('/tmp/slgenXXXXX');
my $year = 2000;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/collab-maint/devscripts.git
_______________________________________________
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
