/hg/icedtea6: Testcase correction - now the test runtime/6929067...

[ptisnovs at icedtea.classpath.org]

changeset 589610636e32 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=589610636e32
author: ptisnovs
date: Wed Dec 08 17:41:44 2010 +0100

	Testcase correction - now the test runtime/6929067/Test6929067.sh
	works correctly also on x86_64 and other platforms.


diffstat:

3 files changed, 60 insertions(+), 1 deletion(-)
ChangeLog                       |    7 +++++
Makefile.am                     |    3 +-
patches/jtreg-6929067-fix.patch |   51 +++++++++++++++++++++++++++++++++++++++

diffs (82 lines):

diff -r 814f715ce323 -r 589610636e32 ChangeLog
--- a/ChangeLog	Tue Dec 07 12:11:55 2010 +0100
+++ b/ChangeLog	Wed Dec 08 17:41:44 2010 +0100
@@ -1,3 +1,10 @@ 2010-12-07  Pavel Tisnovsky  <ptisnovs at r
+2010-12-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/jtreg-6929067-fix.patch:
+	Testcase correction - now the test works correctly also on x86_64 and
+	other platforms.
+
 2010-12-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am:
diff -r 814f715ce323 -r 589610636e32 Makefile.am
--- a/Makefile.am	Tue Dec 07 12:11:55 2010 +0100
+++ b/Makefile.am	Wed Dec 08 17:41:44 2010 +0100
@@ -307,7 +307,8 @@ ICEDTEA_PATCHES = \
 	patches/jtreg-T6650759m-fix.patch \
 	patches/openjdk/7003777-bad-html-entity-parse.patch \
 	patches/openjdk/6941936-broken-pipe.patch \
-	patches/openjdk/6943219-failure-in-linux.patch
+	patches/openjdk/6943219-failure-in-linux.patch \
+	patches/jtreg-6929067-fix.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 814f715ce323 -r 589610636e32 patches/jtreg-6929067-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-6929067-fix.patch	Wed Dec 08 17:41:44 2010 +0100
@@ -0,0 +1,51 @@
+--- openjdk-old/hotspot/test/runtime/6929067/Test6929067.sh	2010-10-08 22:29:24.000000000 +0200
++++ openjdk/hotspot/test/runtime/6929067/Test6929067.sh	2010-12-08 13:45:18.000000000 +0100
+@@ -7,6 +7,7 @@
+ ## @run shell Test6929067.sh
+ ##
+ 
++
+ if [ "${TESTSRC}" = "" ]
+ then TESTSRC=.
+ fi
+@@ -42,7 +43,24 @@
+     ;;
+ esac
+ 
+-LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/i386/client:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH
++COMP_FLAG="-m32"
++
++# Get ARCH specifics
++ARCH=`uname -m`
++case "$ARCH" in
++  x86_64)
++    ARCH=amd64
++    COMP_FLAG="-m64"
++    ;;
++  i585)
++    ARCH=i386
++    ;;
++  i686)
++    ARCH=i386
++esac
++
++LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/${ARCH}/client:${TESTJAVA}/jre/lib/${ARCH}/server:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH
++
+ export LD_LIBRARY_PATH
+ 
+ THIS_DIR=`pwd`
+@@ -55,6 +73,13 @@
+ 
+ ${TESTJAVA}${FS}bin${FS}javac T.java
+ 
+-gcc -o invoke -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c ${TESTJAVA}/jre/lib/i386/client/libjvm.so
++echo "Architecture: ${ARCH}"
++echo "Compilation flag: ${COMP_FLAG}"
++
++gcc ${COMP_FLAG} -o invoke \
++-L${TESTJAVA}/jre/lib/${ARCH}/client \
++-L${TESTJAVA}/jre/lib/${ARCH}/server \
++-ljvm -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c
++
+ ./invoke
+ exit $?