[SCM] UNNAMED PROJECT branch, master, updated. 0.43-9-g7b6ab0b

Niels Thykier niels at thykier.net
Thu Apr 25 18:54:47 UTC 2013


The following commit has been merged in the master branch:
commit 1b994a0a62309a6049237902297751b3b8aaee24
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Apr 25 18:08:01 2013 +0200

    t: Add new TAP testsuite
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 4d3393b..b225512 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 javatools (0.44) UNRELEASED; urgency=low
 
+  * Add a new minor TAP based test suite.
   * Fix bug in jh_repack when removing empty directories.
     Thanks to Francesco Poli for reporting it and writing
     the patch.  (Closes: #689788)
diff --git a/debian/control b/debian/control
index e85aad3..235ffbf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,10 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Matthew Johnson <mjj29 at debian.org>, Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: default-jdk, libarchive-zip-perl (>= 1.30-6~), markdown, perl
+Build-Depends-Indep: default-jdk, libarchive-zip-perl (>= 1.30-6~), markdown, perl,
+     libtest-minimumversion-perl,
+     libtest-strict-perl,
+     perl (>= 5.12) | libtest-simple-perl (>= 0.93)
 Standards-Version: 3.9.3
 Section: java
 Vcs-Git: git://git.debian.org/git/pkg-java/javatools.git
diff --git a/debian/rules b/debian/rules
index 74a6c82..8f71234 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,11 @@ POD2MAN=pod2man --stderr --utf8 -c Javahelper -r "$(VERSION)"
 
 MOD_PATH:=lib/Debian/Javahelper
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	jobs = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	PAR_ARGS=-j $(jobs)
+endif
+
 %:
 	dh $@
 
@@ -33,6 +38,7 @@ override_dh_auto_build: jh_lib.sh
 		cat tutorial-header.html - tutorial-footer.html > tutorial.html
 
 runtests: jh_lib.sh
+	prove -Ilib $(PAR_ARGS) t
 	cd tests && ./tests.sh
 
 override_dh_auto_test: runtests
diff --git a/t/minimum-version.t b/t/minimum-version.t
new file mode 100755
index 0000000..a6d2a3e
--- /dev/null
+++ b/t/minimum-version.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl -w
+
+use strict;
+use warnings;
+
+use Test::More;
+eval 'use Test::MinimumVersion';
+plan skip_all => 'Test::MinimumVersion required to run this test' if $@;
+
+# sarge was released with 5.8.4, etch with 5.8.8, lenny with 5.10.0
+our $REQUIRED = 'v5.10.0';
+all_minimum_version_ok($REQUIRED, { paths => ['.'] , no_plan => 1});
+
+done_testing();
diff --git a/t/strict.t b/t/strict.t
new file mode 100755
index 0000000..5bf5560
--- /dev/null
+++ b/t/strict.t
@@ -0,0 +1,10 @@
+#!/usr/bin/perl -w
+
+use strict;
+use warnings;
+
+use Test::More;
+eval 'use Test::Strict';
+plan skip_all => 'Test::Strict required to run this test' if $@;
+
+all_perl_files_ok();

-- 
UNNAMED PROJECT



More information about the pkg-java-commits mailing list