[openjdk-8] 01/01: Fixed the detection of jtreg

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit c52b15ba82f96c353528828895551c5af715aad9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 2 18:14:34 2014 +0200

    Fixed the detection of jtreg
---
 debian/patches/fix-jtreg-location.patch | 14 ++++++++++++++
 debian/rules                            |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix-jtreg-location.patch b/debian/patches/fix-jtreg-location.patch
new file mode 100644
index 0000000..a72997b
--- /dev/null
+++ b/debian/patches/fix-jtreg-location.patch
@@ -0,0 +1,14 @@
+Description: Fixes the path to jtreg on Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/common/autoconf/generated-configure.sh
++++ b/common/autoconf/generated-configure.sh
+@@ -16645,7 +16645,7 @@
+ 
+ 
+       # jtreg win32 script works for everybody
+-      JTREGEXE="$JT_HOME/win32/bin/jtreg"
++      JTREGEXE="/usr/bin/jtreg"
+ 
+       if test ! -f "$JTREGEXE"; then
+         as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
diff --git a/debian/rules b/debian/rules
index 5a3ac7f..dc60151 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,7 +93,6 @@ export ALT_OBJCOPY=fake
 export ALT_STRIP_POLICY=no_strip
 
 with_check = $(if $(findstring nocheck, $(DEB_BUILD_OPTIONS)),,yes)
-with_check = no
 ifneq (,$(filter $(DEB_HOST_ARCH), armel))
   with_check = disabled running check on $(DEB_HOST_ARCH)
 endif
@@ -307,6 +306,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), sparc64))
 endif
 
 DISTRIBUTION_PATCHES += \
+        debian/patches/fix-jtreg-location.patch \
 	debian/patches/system-libjpeg.patch \
 	debian/patches/system-libpng.patch \
 	debian/patches/system-lcms.patch \
@@ -471,6 +471,7 @@ CONFIGURE_ARGS += --with-zlib=system \
                   --with-lcms=system \
                   --with-stdc++lib=dynamic \
                   --with-milestone="fcs" \
+                  --with-jtreg \
                   --enable-unlimited-crypto
 
 ifeq ($(with_systemtap),yes)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git