Mercurial > hg > release > icedtea7-forest-2.0 > hotspot
changeset 2337:74ff0c608935
Fixed regression test Test6929067 so it should works on all platforms.
| author | ptisnovs |
|---|---|
| date | Wed, 18 May 2011 22:57:17 +0200 |
| parents | ef8632d52263 |
| children | 591c7dc0b2ee |
| files | test/runtime/6929067/Test6929067.sh |
| diffstat | 1 files changed, 33 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/test/runtime/6929067/Test6929067.sh Wed Apr 20 04:38:06 2011 +0100 +++ b/test/runtime/6929067/Test6929067.sh Wed May 18 22:57:17 2011 +0200 @@ -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 [ $? -eq 0 ] +then + COMP_FLAG="-m64" +fi + +# Get ARCH specifics +ARCH=`uname -m` +case "$ARCH" in + x86_64) + ARCH=amd64 + ;; + i586) + 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 +79,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 -lpthread -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c + ./invoke exit $?