[SCM] UNNAMED PROJECT branch, master, updated. 0.31-46-g8b6d4e3

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  8b6d4e3c3bae54f2a45beddc9a111ce192f4bc22 (commit)
       via  dd03390e12f5d9203b65af4492085318f70d59a4 (commit)
      from  f88696bc11f28f4c0bed73365850e287fe9538c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8b6d4e3c3bae54f2a45beddc9a111ce192f4bc22
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Feb 17 18:46:27 2011 +0100

    Skip tests if fastjar is the only thing we can find
    
    fastjar produces some incompatible results

commit dd03390e12f5d9203b65af4492085318f70d59a4
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Feb 17 18:46:10 2011 +0100

    Added missing B-D-I for running the test suite

-----------------------------------------------------------------------

Summary of changes:
 debian/control |    1 +
 tests/tests.sh |   18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6adc8f5..d56cc17 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ 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.20)
 Standards-Version: 3.9.1
 Section: java
 Vcs-Git: git://git.debian.org/git/pkg-java/javatools.git
diff --git a/tests/tests.sh b/tests/tests.sh
index 27d7e40..6f87db7 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -1,9 +1,23 @@
 #!/bin/bash --
 
+
 set -e
 _DIR=`pwd`
 . ../jh_lib.sh.in
 
+[ "$JAVA_HOME" ] || JAVA_HOME="/usr/lib/jvm/default-java"
+
+JAR="$JAVA_HOME/bin/jar"
+if [ ! -x "$JAR" -a -x "/usr/bin/jar" ] ; then
+    JAR="/usr/bin/jar"
+fi
+
+if readlink "$JAR" | grep -q "fastjar$" ; then
+    echo "fastjar produces different results than we expect." >&2
+    echo "Skipping test" >&2
+    exit 0
+fi
+
 run_jh_manifest()
 {
     cd ..
@@ -20,9 +34,9 @@ checkmanifest()
 	shift
 	shift
 	touch foo
-	jar cfm test.jar $source foo
+	"$JAR" cfm test.jar $source foo
 	run_jh_manifest "$@" "$_DIR/test.jar"
-	jar xf test.jar META-INF/MANIFEST.MF
+	"$JAR" xf test.jar META-INF/MANIFEST.MF
 	if ! diff -u $verify META-INF/MANIFEST.MF > test.diff; then
 		error=1
 		echo "ERROR: difference detected:"


hooks/post-receive
-- 
UNNAMED PROJECT