[Fwd: Re: Reviewer needed - fix for regression test hotspot/test/runtime/6929067/Test6929067]

[Dr Andrew John Hughes]

On 15:21 Wed 08 Dec     , Pavel Tisnovsky wrote:
> > Can you post a clean diff of the current patch?  I'm confused as to which
> > one I'm reviewing here.
> > 
> 
> Ah sorry, it might be confusing. New hg export generated from recent
> IcedTea6 HEAD is stored in attachment.
> 
> Pavel
> 

Yeah, that's better.  This one has the changes I was expecting. :-)
Ok for HEAD.

> # HG changeset patch
> # User ptisnovs
> # Date 1291818132 -3600
> # Node ID 5acc0a02c11f84a95dd700e5a5ba8984cde0c2ab
> # Parent  814f715ce323dfe7c7d899edbe429ac1768649dd
> Regression test fix.
> 
> diff -r 814f715ce323 -r 5acc0a02c11f ChangeLog
> --- a/ChangeLog	Tue Dec 07 12:11:55 2010 +0100
> +++ b/ChangeLog	Wed Dec 08 15:22:12 2010 +0100
> @@ -1,3 +1,10 @@
> +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 5acc0a02c11f Makefile.am
> --- a/Makefile.am	Tue Dec 07 12:11:55 2010 +0100
> +++ b/Makefile.am	Wed Dec 08 15:22:12 2010 +0100
> @@ -307,7 +307,8 @@
>  	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 5acc0a02c11f patches/jtreg-6929067-fix.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/jtreg-6929067-fix.patch	Wed Dec 08 15:22:12 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 $?


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8