Reviewer needed: second fix for regression hotspot test hotspot/test/runtime/6929067/Test6929067 for IcedTea6

[Dr Andrew John Hughes]

On 11:20 Fri 13 May     , Pavel Tisnovsky wrote:
> Dr Andrew John Hughes wrote:
> > On 15:34 Thu 12 May     , Pavel Tisnovsky wrote:
> >> Hi all,
> >>
> >>
> > 
> > Looks fine to me.  Did you manage to get it upstream or are they still playing games?
> > 
> 
> Hi Andrew,
> 
> Chris found a typo in the test script ("i585" was used instead of "i587"
> in a case control statement). Can you please review and approve new
> changes in the tests please? I've only changed the string mentioned
> above and date in the changelog entry:
> 
> 2011-05-13  Pavel Tisnovsky  <ptisnovs at redhat.com>
> 
>         * patches/jtreg-6929067-fix.patch: fix this test
>         so it works on any combination of JVM and platform
>         (32 bit and 64 bit)
> 
> Thank you in advance,
> Pavel

Huh? I don't see either i585 or i587 in the patch, just i586.

> diff -r d8750486e54c patches/jtreg-6929067-fix.patch
> --- a/patches/jtreg-6929067-fix.patch	Wed May 11 20:27:41 2011 -0400
> +++ b/patches/jtreg-6929067-fix.patch	Thu May 12 14:50:58 2011 +0200
> @@ -1,26 +1,25 @@
>  --- 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 @@
> +@@ -42,7 +42,31 @@
>       ;;
>   esac
>   
>  -LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/i386/client:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH
>  +COMP_FLAG="-m32"
>  +
> ++# Test if JDK is 32 or 64 bits
> ++${TESTJAVA}/bin/java -d64
> ++
> ++if [[ $? == 0 ]]
> ++then
> ++    COMP_FLAG="-m64"
> ++fi
> ++
>  +# Get ARCH specifics
>  +ARCH=`uname -m`
>  +case "$ARCH" in
>  +  x86_64)
>  +    ARCH=amd64
> -+    COMP_FLAG="-m64"
>  +    ;;
>  +  i586)
>  +    ARCH=i386
> @@ -34,7 +33,7 @@
>   export LD_LIBRARY_PATH
>   
>   THIS_DIR=`pwd`
> -@@ -55,6 +73,13 @@
> +@@ -55,6 +79,13 @@
>   
>   ${TESTJAVA}${FS}bin${FS}javac T.java
>   


-- 
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: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37