jdk8-mips64-public/hotspot: changeset 4832:d1897e7e0488

     1.1 --- a/make/excludeSrc.make	Thu Mar 28 09:07:44 2013 +0100
     1.2 +++ b/make/excludeSrc.make	Thu Mar 28 15:42:11 2013 -0700
     1.3 @@ -28,7 +28,8 @@
     1.4        Src_Files_EXCLUDE += jvmtiGetLoadedClasses.cpp forte.cpp jvmtiThreadState.cpp jvmtiExtensions.cpp \
     1.5  	jvmtiImpl.cpp jvmtiManageCapabilities.cpp jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp \
     1.6  	jvmtiCodeBlobEvents.cpp jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp jvmtiEnvThreadState.cpp \
     1.7 -	jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp
     1.8 +	jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
     1.9 +	jvmtiClassFileReconstituter.cpp
    1.10  endif
    1.11  
    1.12  ifeq ($(INCLUDE_FPROF), false)

     2.1 --- a/test/compiler/5091921/Test6890943.sh	Thu Mar 28 09:07:44 2013 +0100
     2.2 +++ b/test/compiler/5091921/Test6890943.sh	Thu Mar 28 15:42:11 2013 -0700
     2.3 @@ -22,26 +22,16 @@
     2.4  # questions.
     2.5  # 
     2.6  # 
     2.7 -
     2.8 +## some tests require path to find test source dir
     2.9  if [ "${TESTSRC}" = "" ]
    2.10  then
    2.11 -  echo "TESTSRC not set.  Test cannot execute.  Failed."
    2.12 -  exit 1
    2.13 +  TESTSRC=${PWD}
    2.14 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
    2.15  fi
    2.16  echo "TESTSRC=${TESTSRC}"
    2.17 -if [ "${TESTJAVA}" = "" ]
    2.18 -then
    2.19 -  echo "TESTJAVA not set.  Test cannot execute.  Failed."
    2.20 -  exit 1
    2.21 -fi
    2.22 -echo "TESTJAVA=${TESTJAVA}"
    2.23 -if [ "${TESTCLASSES}" = "" ]
    2.24 -then
    2.25 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    2.26 -  exit 1
    2.27 -fi
    2.28 -echo "TESTCLASSES=${TESTCLASSES}"
    2.29 -echo "CLASSPATH=${CLASSPATH}"
    2.30 +## Adding common setup Variables for running shell tests.
    2.31 +. ${TESTSRC}/../../test_env.sh
    2.32 +
    2.33  
    2.34  set -x
    2.35  
    2.36 @@ -50,7 +40,7 @@
    2.37  cp ${TESTSRC}/output6890943.txt .
    2.38  cp ${TESTSRC}/Test6890943.sh .
    2.39  
    2.40 -${TESTJAVA}/bin/javac -d . Test6890943.java
    2.41 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test6890943.java
    2.42  
    2.43  ${TESTJAVA}/bin/java -XX:-PrintVMOptions -XX:+IgnoreUnrecognizedVMOptions ${TESTVMOPTS} Test6890943 < input6890943.txt > pretest.out 2>&1
    2.44

     3.1 --- a/test/compiler/5091921/Test7005594.sh	Thu Mar 28 09:07:44 2013 +0100
     3.2 +++ b/test/compiler/5091921/Test7005594.sh	Thu Mar 28 15:42:11 2013 -0700
     3.3 @@ -22,26 +22,15 @@
     3.4  # questions.
     3.5  # 
     3.6  # 
     3.7 -
     3.8 +## some tests require path to find test source dir
     3.9  if [ "${TESTSRC}" = "" ]
    3.10  then
    3.11 -  echo "TESTSRC not set.  Test cannot execute.  Failed."
    3.12 -  exit 1
    3.13 +  TESTSRC=${PWD}
    3.14 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
    3.15  fi
    3.16  echo "TESTSRC=${TESTSRC}"
    3.17 -if [ "${TESTJAVA}" = "" ]
    3.18 -then
    3.19 -  echo "TESTJAVA not set.  Test cannot execute.  Failed."
    3.20 -  exit 1
    3.21 -fi
    3.22 -echo "TESTJAVA=${TESTJAVA}"
    3.23 -if [ "${TESTCLASSES}" = "" ]
    3.24 -then
    3.25 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    3.26 -  exit 1
    3.27 -fi
    3.28 -echo "TESTCLASSES=${TESTCLASSES}"
    3.29 -echo "CLASSPATH=${CLASSPATH}"
    3.30 +## Adding common setup Variables for running shell tests.
    3.31 +. ${TESTSRC}/../../test_env.sh
    3.32  
    3.33  # Amount of physical memory in megabytes
    3.34  MEM=0
    3.35 @@ -87,7 +76,7 @@
    3.36  cp ${TESTSRC}/Test7005594.java .
    3.37  cp ${TESTSRC}/Test7005594.sh .
    3.38  
    3.39 -${TESTJAVA}/bin/javac -d . Test7005594.java
    3.40 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7005594.java
    3.41  
    3.42  ${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
    3.43

     4.1 --- a/test/compiler/6857159/Test6857159.sh	Thu Mar 28 09:07:44 2013 +0100
     4.2 +++ b/test/compiler/6857159/Test6857159.sh	Thu Mar 28 15:42:11 2013 -0700
     4.3 @@ -22,33 +22,22 @@
     4.4  # questions.
     4.5  # 
     4.6  # 
     4.7 -
     4.8 +## some tests require path to find test source dir
     4.9  if [ "${TESTSRC}" = "" ]
    4.10  then
    4.11 -  echo "TESTSRC not set.  Test cannot execute.  Failed."
    4.12 -  exit 1
    4.13 +  TESTSRC=${PWD}
    4.14 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
    4.15  fi
    4.16  echo "TESTSRC=${TESTSRC}"
    4.17 -if [ "${TESTJAVA}" = "" ]
    4.18 -then
    4.19 -  echo "TESTJAVA not set.  Test cannot execute.  Failed."
    4.20 -  exit 1
    4.21 -fi
    4.22 -echo "TESTJAVA=${TESTJAVA}"
    4.23 -if [ "${TESTCLASSES}" = "" ]
    4.24 -then
    4.25 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    4.26 -  exit 1
    4.27 -fi
    4.28 -echo "TESTCLASSES=${TESTCLASSES}"
    4.29 -echo "CLASSPATH=${CLASSPATH}"
    4.30 +## Adding common setup Variables for running shell tests.
    4.31 +. ${TESTSRC}/../../test_env.sh
    4.32  
    4.33  set -x
    4.34  
    4.35  cp ${TESTSRC}/Test6857159.java .
    4.36  cp ${TESTSRC}/Test6857159.sh .
    4.37  
    4.38 -${TESTJAVA}/bin/javac -d . Test6857159.java
    4.39 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test6857159.java
    4.40  
    4.41  ${TESTJAVA}/bin/java  ${TESTVMOPTS} -Xbatch -XX:+PrintCompilation -XX:CompileOnly=Test6857159\$ct.run Test6857159 > test.out 2>&1
    4.42

     5.1 --- a/test/compiler/7068051/Test7068051.sh	Thu Mar 28 09:07:44 2013 +0100
     5.2 +++ b/test/compiler/7068051/Test7068051.sh	Thu Mar 28 15:42:11 2013 -0700
     5.3 @@ -22,28 +22,24 @@
     5.4  # questions.
     5.5  # 
     5.6  # 
     5.7 -
     5.8 +## some tests require path to find test source dir
     5.9  if [ "${TESTSRC}" = "" ]
    5.10  then
    5.11 -  echo "TESTSRC not set.  Test cannot execute.  Failed."
    5.12 -  exit 1
    5.13 +  TESTSRC=${PWD}
    5.14 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
    5.15  fi
    5.16  echo "TESTSRC=${TESTSRC}"
    5.17 -if [ "${TESTJAVA}" = "" ]
    5.18 -then
    5.19 -  echo "TESTJAVA not set.  Test cannot execute.  Failed."
    5.20 -  exit 1
    5.21 -fi
    5.22 -echo "TESTJAVA=${TESTJAVA}"
    5.23 +## Adding common setup Variables for running shell tests.
    5.24 +. ${TESTSRC}/../../test_env.sh
    5.25  
    5.26  set -x
    5.27  
    5.28 -${TESTJAVA}/bin/jar xf ${TESTJAVA}/jre/lib/javaws.jar
    5.29 -${TESTJAVA}/bin/jar cf foo.jar *
    5.30 +${COMPILEJAVA}/bin/jar xf ${COMPILEJAVA}/jre/lib/javaws.jar
    5.31 +${COMPILEJAVA}/bin/jar cf foo.jar *
    5.32  cp ${TESTSRC}/Test7068051.java ./
    5.33 -${TESTJAVA}/bin/jar -uf0 foo.jar Test7068051.java
    5.34 +${COMPILEJAVA}/bin/jar -uf0 foo.jar Test7068051.java
    5.35  
    5.36 -${TESTJAVA}/bin/javac -d . Test7068051.java
    5.37 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7068051.java
    5.38  
    5.39  ${TESTJAVA}/bin/java ${TESTVMOPTS} -showversion -Xbatch Test7068051 foo.jar
    5.40

     6.1 --- a/test/compiler/7070134/Test7070134.sh	Thu Mar 28 09:07:44 2013 +0100
     6.2 +++ b/test/compiler/7070134/Test7070134.sh	Thu Mar 28 15:42:11 2013 -0700
     6.3 @@ -22,33 +22,22 @@
     6.4  # questions.
     6.5  # 
     6.6  # 
     6.7 -
     6.8 +## some tests require path to find test source dir
     6.9  if [ "${TESTSRC}" = "" ]
    6.10  then
    6.11 -  echo "TESTSRC not set.  Test cannot execute.  Failed."
    6.12 -  exit 1
    6.13 +  TESTSRC=${PWD}
    6.14 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
    6.15  fi
    6.16  echo "TESTSRC=${TESTSRC}"
    6.17 -if [ "${TESTJAVA}" = "" ]
    6.18 -then
    6.19 -  echo "TESTJAVA not set.  Test cannot execute.  Failed."
    6.20 -  exit 1
    6.21 -fi
    6.22 -echo "TESTJAVA=${TESTJAVA}"
    6.23 -if [ "${TESTCLASSES}" = "" ]
    6.24 -then
    6.25 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    6.26 -  exit 1
    6.27 -fi
    6.28 -echo "TESTCLASSES=${TESTCLASSES}"
    6.29 -echo "CLASSPATH=${CLASSPATH}"
    6.30 +## Adding common setup Variables for running shell tests.
    6.31 +. ${TESTSRC}/../../test_env.sh
    6.32  
    6.33  set -x
    6.34  
    6.35  cp ${TESTSRC}/Stemmer.java .
    6.36  cp ${TESTSRC}/words .
    6.37  
    6.38 -${TESTJAVA}/bin/javac -d . Stemmer.java
    6.39 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Stemmer.java
    6.40  
    6.41  ${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbatch Stemmer words > test.out 2>&1
    6.42

     7.1 --- a/test/compiler/7200264/Test7200264.sh	Thu Mar 28 09:07:44 2013 +0100
     7.2 +++ b/test/compiler/7200264/Test7200264.sh	Thu Mar 28 15:42:11 2013 -0700
     7.3 @@ -23,50 +23,15 @@
     7.4  # 
     7.5  # 
     7.6  
     7.7 +## some tests require path to find test source dir
     7.8  if [ "${TESTSRC}" = "" ]
     7.9  then
    7.10 -  echo "TESTSRC not set.  Test cannot execute.  Failed."
    7.11 -  exit 1
    7.12 +  TESTSRC=${PWD}
    7.13 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
    7.14  fi
    7.15  echo "TESTSRC=${TESTSRC}"
    7.16 -if [ "${TESTJAVA}" = "" ]
    7.17 -then
    7.18 -  echo "TESTJAVA not set.  Test cannot execute.  Failed."
    7.19 -  exit 1
    7.20 -fi
    7.21 -echo "TESTJAVA=${TESTJAVA}"
    7.22 -if [ "${TESTCLASSES}" = "" ]
    7.23 -then
    7.24 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    7.25 -  exit 1
    7.26 -fi
    7.27 -echo "TESTCLASSES=${TESTCLASSES}"
    7.28 -echo "CLASSPATH=${CLASSPATH}"
    7.29 -
    7.30 -# set platform-dependent variables
    7.31 -OS=`uname -s`
    7.32 -case "$OS" in
    7.33 -  SunOS | Linux | Darwin )
    7.34 -    NULL=/dev/null
    7.35 -    PS=":"
    7.36 -    FS="/"
    7.37 -    ;;
    7.38 -  Windows_* )
    7.39 -    NULL=NUL
    7.40 -    PS=";"
    7.41 -    FS="\\"
    7.42 -    ;;
    7.43 -  CYGWIN_* )
    7.44 -    NULL=/dev/null
    7.45 -    PS=";"
    7.46 -    FS="/"
    7.47 -    ;;
    7.48 -  * )
    7.49 -    echo "Unrecognized system!"
    7.50 -    exit 1;
    7.51 -    ;;
    7.52 -esac
    7.53 -
    7.54 +## Adding common setup Variables for running shell tests.
    7.55 +. ${TESTSRC}/../../test_env.sh
    7.56  
    7.57  ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Xinternalversion | sed 's/amd64/x86/' | grep "x86" | grep "Server VM" | grep "debug"
    7.58  
    7.59 @@ -88,7 +53,7 @@
    7.60  fi
    7.61  
    7.62  cp ${TESTSRC}${FS}TestIntVect.java .
    7.63 -${TESTJAVA}${FS}bin${FS}javac -d . TestIntVect.java
    7.64 +${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} -d . TestIntVect.java
    7.65  
    7.66  ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+PrintCompilation -XX:+TraceNewVectors TestIntVect > test.out 2>&1
    7.67

     8.1 --- a/test/gc/6941923/test6941923.sh	Thu Mar 28 09:07:44 2013 +0100
     8.2 +++ b/test/gc/6941923/test6941923.sh	Thu Mar 28 15:42:11 2013 -0700
     8.3 @@ -5,38 +5,25 @@
     8.4  ## @author yqi 
     8.5  ## @run shell test6941923.sh
     8.6  ##
     8.7 +## some tests require path to find test source dir
     8.8 +if [ "${TESTSRC}" = "" ]
     8.9 +then
    8.10 +  TESTSRC=${PWD}
    8.11 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
    8.12 +fi
    8.13 +echo "TESTSRC=${TESTSRC}"
    8.14 +## Adding common setup Variables for running shell tests.
    8.15 +. ${TESTSRC}/../../test_env.sh
    8.16  
    8.17  ## skip on windows
    8.18  OS=`uname -s`
    8.19  case "$OS" in
    8.20 -  SunOS | Linux | Darwin )
    8.21 -    NULL=/dev/null
    8.22 -    PS=":"
    8.23 -    FS="/"
    8.24 -    ;;
    8.25    Windows_* | CYGWIN_* )
    8.26      echo "Test skipped for Windows"
    8.27      exit 0 
    8.28      ;;
    8.29 -  * )
    8.30 -    echo "Unrecognized system!"
    8.31 -    exit 1;
    8.32 -    ;;
    8.33  esac
    8.34  
    8.35 -if [ "${JAVA_HOME}" = "" ]
    8.36 -then
    8.37 -  echo "JAVA_HOME not set"
    8.38 -  exit 0
    8.39 -fi
    8.40 -
    8.41 -$JAVA_HOME/bin/java ${TESTVMOPTS} -version > $NULL 2>&1
    8.42 -
    8.43 -if [ $? != 0 ]; then
    8.44 -  echo "Wrong JAVA_HOME? JAVA_HOME: $JAVA_HOME"
    8.45 -  exit $?
    8.46 -fi
    8.47 -
    8.48  # create a small test case
    8.49  testname="Test"
    8.50  if [ -e ${testname}.java ]; then
    8.51 @@ -96,10 +83,10 @@
    8.52  msgfail="failed"
    8.53  gclogsize="16K"
    8.54  filesize=$((16*1024))
    8.55 -$JAVA_HOME/bin/javac ${testname}.java > $NULL 2>&1
    8.56 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${testname}.java > $NULL 2>&1
    8.57  
    8.58  if [ $? != 0 ]; then
    8.59 -  echo "$JAVA_HOME/bin/javac ${testname}.java $fail"
    8.60 +  echo "${COMPILEJAVA}/bin/javac ${testname}.java $fail"
    8.61    exit -1
    8.62  fi
    8.63  
    8.64 @@ -119,7 +106,7 @@
    8.65  
    8.66  options="-Xloggc:$logfile -XX:+UseConcMarkSweepGC -XX:+PrintGC -XX:+PrintGCDetails -XX:+UseGCLogFileRotation  -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=$gclogsize"
    8.67  echo "Test gc log rotation in same file, wait for $tts minutes ...."
    8.68 -$JAVA_HOME/bin/java ${TESTVMOPTS} $options $testname $tts
    8.69 +${TESTJAVA}/bin/java $options $testname $tts
    8.70  if [ $? != 0 ]; then
    8.71    echo "$msgfail"
    8.72    exit -1
    8.73 @@ -148,7 +135,7 @@
    8.74  numoffiles=3
    8.75  options="-Xloggc:$logfile -XX:+UseConcMarkSweepGC -XX:+PrintGC -XX:+PrintGCDetails -XX:+UseGCLogFileRotation  -XX:NumberOfGCLogFiles=$numoffiles -XX:GCLogFileSize=$gclogsize"
    8.76  echo "Test gc log rotation in $numoffiles files, wait for $tts minutes ...."
    8.77 -$JAVA_HOME/bin/java ${TESTVMOPTS} $options $testname $tts
    8.78 +${TESTJAVA}/bin/java $options $testname $tts
    8.79  if [ $? != 0 ]; then
    8.80    echo "$msgfail"
    8.81    exit -1

     9.1 --- a/test/runtime/6626217/Test6626217.sh	Thu Mar 28 09:07:44 2013 +0100
     9.2 +++ b/test/runtime/6626217/Test6626217.sh	Thu Mar 28 15:42:11 2013 -0700
     9.3 @@ -27,78 +27,29 @@
     9.4  # @summary Loader-constraint table allows arrays instead of only the base-classes
     9.5  # @run shell Test6626217.sh
     9.6  #
     9.7 -
     9.8 +## some tests require path to find test source dir
     9.9  if [ "${TESTSRC}" = "" ]
    9.10 -  then TESTSRC=.
    9.11 +then
    9.12 +  TESTSRC=${PWD}
    9.13 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
    9.14  fi
    9.15 -
    9.16 -if [ "${TESTJAVA}" = "" ]
    9.17 -then
    9.18 -  PARENT=`dirname \`which java\``
    9.19 -  TESTJAVA=`dirname ${PARENT}`
    9.20 -  echo "TESTJAVA not set, selecting " ${TESTJAVA}
    9.21 -  echo "If this is incorrect, try setting the variable manually."
    9.22 -fi
    9.23 -
    9.24 -if [ "${TESTCLASSES}" = "" ]
    9.25 -then
    9.26 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    9.27 -  exit 1
    9.28 -fi
    9.29 -
    9.30 -# set platform-dependent variables
    9.31 -OS=`uname -s`
    9.32 -case "$OS" in
    9.33 -  SunOS | Linux | Darwin )
    9.34 -    NULL=/dev/null
    9.35 -    PS=":"
    9.36 -    FS="/"
    9.37 -    RM=/bin/rm
    9.38 -    CP=/bin/cp
    9.39 -    MV=/bin/mv
    9.40 -    ;;
    9.41 -  Windows_* )
    9.42 -    NULL=NUL
    9.43 -    PS=";"
    9.44 -    FS="\\"
    9.45 -    RM=rm
    9.46 -    CP=cp
    9.47 -    MV=mv
    9.48 -    ;;
    9.49 -  CYGWIN_* )
    9.50 -    NULL=/dev/null
    9.51 -    PS=";"
    9.52 -    FS="/"
    9.53 -    RM=rm
    9.54 -    CP=cp
    9.55 -    MV=mv
    9.56 -    ;;
    9.57 -  * )
    9.58 -    echo "Unrecognized system!"
    9.59 -    exit 1;
    9.60 -    ;;
    9.61 -esac
    9.62 -
    9.63 -JEMMYPATH=${CPAPPEND}
    9.64 -CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
    9.65 -
    9.66 -THIS_DIR=`pwd`
    9.67 +echo "TESTSRC=${TESTSRC}"
    9.68 +## Adding common setup Variables for running shell tests.
    9.69 +. ${TESTSRC}/../../test_env.sh
    9.70  
    9.71  JAVA=${TESTJAVA}${FS}bin${FS}java
    9.72 -JAVAC=${TESTJAVA}${FS}bin${FS}javac
    9.73 -
    9.74 -${JAVA} ${TESTVMOPTS} -version
    9.75 +JAVAC=${COMPILEJAVA}${FS}bin${FS}javac
    9.76  
    9.77  # Current directory is scratch directory, copy all the test source there
    9.78  # (for the subsequent moves to work).
    9.79 -${CP} ${TESTSRC}${FS}*  ${THIS_DIR}
    9.80 +${CP} ${TESTSRC}${FS}* ${THIS_DIR}
    9.81  
    9.82  # A Clean Compile: this line will probably fail within jtreg as have a clean dir:
    9.83  ${RM} -f *.class *.impl many_loader.java
    9.84  
    9.85  # Compile all the usual suspects, including the default 'many_loader'
    9.86  ${CP} many_loader1.java.foo many_loader.java
    9.87 -${JAVAC} -source 1.4 -target 1.4 -Xlint *.java
    9.88 +${JAVAC} ${TESTJAVACOPTS} -source 1.4 -target 1.4 -Xlint *.java
    9.89  
    9.90  # Rename the class files, so the custom loader (and not the system loader) will find it
    9.91  ${MV} from_loader2.class from_loader2.impl2
    9.92 @@ -106,7 +57,7 @@
    9.93  # Compile the next version of 'many_loader'
    9.94  ${MV} many_loader.class many_loader.impl1
    9.95  ${CP} many_loader2.java.foo many_loader.java
    9.96 -${JAVAC} -source 1.4 -target 1.4 -Xlint many_loader.java
    9.97 +${JAVAC} ${TESTJAVACOPTS} -source 1.4 -target 1.4 -Xlint many_loader.java
    9.98  
    9.99  # Rename the class file, so the custom loader (and not the system loader) will find it
   9.100  ${MV} many_loader.class many_loader.impl2

    10.1 --- a/test/runtime/6878713/Test6878713.sh	Thu Mar 28 09:07:44 2013 +0100
    10.2 +++ b/test/runtime/6878713/Test6878713.sh	Thu Mar 28 15:42:11 2013 -0700
    10.3 @@ -34,57 +34,20 @@
    10.4  ## @summary Verifier heap corruption, relating to backward jsrs
    10.5  ## @run shell Test6878713.sh
    10.6  ##
    10.7 -
    10.8 +## some tests require path to find test source dir
    10.9  if [ "${TESTSRC}" = "" ]
   10.10 -then TESTSRC=.
   10.11 +then
   10.12 +  TESTSRC=${PWD}
   10.13 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
   10.14  fi
   10.15 -
   10.16 -if [ "${TESTJAVA}" = "" ]
   10.17 -then
   10.18 -  PARENT=`dirname \`which java\``
   10.19 -  TESTJAVA=`dirname ${PARENT}`
   10.20 -  echo "TESTJAVA not set, selecting " ${TESTJAVA}
   10.21 -  echo "If this is incorrect, try setting the variable manually."
   10.22 -fi
   10.23 -
   10.24 -if [ "${TESTCLASSES}" = "" ]
   10.25 -then
   10.26 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
   10.27 -  exit 1
   10.28 -fi
   10.29 -
   10.30 -# set platform-dependent variables
   10.31 -OS=`uname -s`
   10.32 -case "$OS" in
   10.33 -  SunOS | Linux | Darwin )
   10.34 -    NULL=/dev/null
   10.35 -    PS=":"
   10.36 -    FS="/"
   10.37 -    ;;
   10.38 -  Windows_* )
   10.39 -    NULL=NUL
   10.40 -    PS=";"
   10.41 -    FS="\\"
   10.42 -    ;;
   10.43 -  CYGWIN_* )
   10.44 -    NULL=/dev/null
   10.45 -    PS=";"
   10.46 -    FS="/"
   10.47 -    ;;
   10.48 -  * )
   10.49 -    echo "Unrecognized system!"
   10.50 -    exit 1;
   10.51 -    ;;
   10.52 -esac
   10.53 -
   10.54 -CLASSPATH=.${PS}${TESTCLASSES} ; export CLASSPATH
   10.55 -
   10.56 -${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -version
   10.57 +echo "TESTSRC=${TESTSRC}"
   10.58 +## Adding common setup Variables for running shell tests.
   10.59 +. ${TESTSRC}/../../test_env.sh
   10.60  
   10.61  TARGET_CLASS=OOMCrashClass1960_2
   10.62  
   10.63  echo "INFO: extracting the target class."
   10.64 -${TESTJAVA}${FS}bin${FS}jar xvf \
   10.65 +${COMPILEJAVA}${FS}bin${FS}jar xvf \
   10.66      ${TESTSRC}${FS}testcase.jar ${TARGET_CLASS}.class
   10.67  
   10.68  # remove any hs_err_pid that might exist here

    11.1 --- a/test/runtime/6929067/Test6929067.sh	Thu Mar 28 09:07:44 2013 +0100
    11.2 +++ b/test/runtime/6929067/Test6929067.sh	Thu Mar 28 15:42:11 2013 -0700
    11.3 @@ -7,18 +7,15 @@
    11.4  ## @compile T.java
    11.5  ## @run shell Test6929067.sh
    11.6  ##
    11.7 -
    11.8 +set -x
    11.9  if [ "${TESTSRC}" = "" ]
   11.10 -then TESTSRC=.
   11.11 +then
   11.12 +  TESTSRC=${PWD}
   11.13 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
   11.14  fi
   11.15 -
   11.16 -if [ "${TESTJAVA}" = "" ]
   11.17 -then
   11.18 -  PARENT=`dirname \`which java\``
   11.19 -  TESTJAVA=`dirname ${PARENT}`
   11.20 -  echo "TESTJAVA not set, selecting " ${TESTJAVA}
   11.21 -  echo "If this is incorrect, try setting the variable manually."
   11.22 -fi
   11.23 +echo "TESTSRC=${TESTSRC}"
   11.24 +## Adding common setup Variables for running shell tests.
   11.25 +. ${TESTSRC}/../../test_env.sh
   11.26  
   11.27  # set platform-dependent variables
   11.28  OS=`uname -s`
   11.29 @@ -107,7 +104,7 @@
   11.30  fi
   11.31  
   11.32  
   11.33 -LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/${ARCH}/${VMTYPE}:/usr/lib:$LD_LIBRARY_PATH
   11.34 +LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${ARCH}/${VMTYPE}:/usr/lib:$LD_LIBRARY_PATH
   11.35  export LD_LIBRARY_PATH
   11.36  
   11.37  cp ${TESTSRC}${FS}invoke.c .
   11.38 @@ -115,15 +112,16 @@
   11.39  # Copy the result of our @compile action:
   11.40  cp ${TESTCLASSES}${FS}T.class .
   11.41  
   11.42 -${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -fullversion
   11.43 -
   11.44  echo "Architecture: ${ARCH}"
   11.45  echo "Compilation flag: ${COMP_FLAG}"
   11.46  echo "VM type: ${VMTYPE}"
   11.47 +# Note pthread may not be found thus invoke creation will fail to be created.
   11.48 +# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
   11.49 +# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
   11.50  
   11.51  gcc -DLINUX ${COMP_FLAG} -o invoke \
   11.52 -  -I${TESTJAVA}/include -I${TESTJAVA}/include/linux \
   11.53 -  -L${TESTJAVA}/jre/lib/${ARCH}/${VMTYPE} \
   11.54 +  -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
   11.55 +  -L${COMPILEJAVA}/jre/lib/${ARCH}/${VMTYPE} \
   11.56    -ljvm -lpthread invoke.c
   11.57  
   11.58  ./invoke

    12.1 --- a/test/runtime/7020373/Test7020373.sh	Thu Mar 28 09:07:44 2013 +0100
    12.2 +++ b/test/runtime/7020373/Test7020373.sh	Thu Mar 28 15:42:11 2013 -0700
    12.3 @@ -10,55 +10,15 @@
    12.4  ##
    12.5  
    12.6  if [ "${TESTSRC}" = "" ]
    12.7 -then TESTSRC=.
    12.8 +then
    12.9 +  TESTSRC=${PWD}
   12.10 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
   12.11  fi
   12.12 +echo "TESTSRC=${TESTSRC}"
   12.13 +## Adding common setup Variables for running shell tests.
   12.14 +. ${TESTSRC}/../../test_env.sh
   12.15  
   12.16 -if [ "${TESTJAVA}" = "" ]
   12.17 -then
   12.18 -  PARENT=`dirname \`which java\``
   12.19 -  TESTJAVA=`dirname ${PARENT}`
   12.20 -  echo "TESTJAVA not set, selecting " ${TESTJAVA}
   12.21 -  echo "If this is incorrect, try setting the variable manually."
   12.22 -fi
   12.23 -
   12.24 -if [ "${TESTCLASSES}" = "" ]
   12.25 -then
   12.26 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
   12.27 -  exit 1
   12.28 -fi
   12.29 -
   12.30 -# set platform-dependent variables
   12.31 -OS=`uname -s`
   12.32 -case "$OS" in
   12.33 -  SunOS | Linux | Darwin )
   12.34 -    NULL=/dev/null
   12.35 -    PS=":"
   12.36 -    FS="/"
   12.37 -    ;;
   12.38 -  Windows_* )
   12.39 -    NULL=NUL
   12.40 -    PS=";"
   12.41 -    FS="\\"
   12.42 -    ;;
   12.43 -  CYGWIN_* )
   12.44 -    NULL=/dev/null
   12.45 -    PS=";"
   12.46 -    FS="/"
   12.47 -    ;;
   12.48 -  * )
   12.49 -    echo "Unrecognized system!"
   12.50 -    exit 1;
   12.51 -    ;;
   12.52 -esac
   12.53 -
   12.54 -JEMMYPATH=${CPAPPEND}
   12.55 -CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
   12.56 -
   12.57 -THIS_DIR=`pwd`
   12.58 -
   12.59 -${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -version
   12.60 -
   12.61 -${TESTJAVA}${FS}bin${FS}jar xvf ${TESTSRC}${FS}testcase.jar
   12.62 +${COMPILEJAVA}${FS}bin${FS}jar xvf ${TESTSRC}${FS}testcase.jar
   12.63  
   12.64  ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} OOMCrashClass4000_1 > test.out 2>&1
   12.65

    13.1 --- a/test/runtime/7051189/Xchecksig.sh	Thu Mar 28 09:07:44 2013 +0100
    13.2 +++ b/test/runtime/7051189/Xchecksig.sh	Thu Mar 28 15:42:11 2013 -0700
    13.3 @@ -29,34 +29,22 @@
    13.4  #
    13.5  
    13.6  if [ "${TESTSRC}" = "" ]
    13.7 -  then TESTSRC=.
    13.8 +then
    13.9 +  TESTSRC=${PWD}
   13.10 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
   13.11  fi
   13.12 -
   13.13 -if [ "${TESTJAVA}" = "" ]
   13.14 -then
   13.15 -  PARENT=`dirname \`which java\``
   13.16 -  TESTJAVA=`dirname ${PARENT}`
   13.17 -  printf "TESTJAVA not set, selecting " ${TESTJAVA}
   13.18 -  printf "  If this is incorrect, try setting the variable manually.\n"
   13.19 -fi
   13.20 -
   13.21 +echo "TESTSRC=${TESTSRC}"
   13.22 +## Adding common setup Variables for running shell tests.
   13.23 +. ${TESTSRC}/../../test_env.sh
   13.24  
   13.25  OS=`uname -s`
   13.26  case "$OS" in
   13.27 -  SunOS | Linux | Darwin )
   13.28 -    FS="/"
   13.29 -    ;;
   13.30    Windows_* | CYGWIN_* )
   13.31      printf "Not testing libjsig.so on Windows. PASSED.\n "
   13.32      exit 0
   13.33      ;;
   13.34 -  * )
   13.35 -    printf "Not testing libjsig.so on unrecognised system. PASSED.\n "
   13.36 -    exit 0
   13.37 -    ;;
   13.38  esac
   13.39  
   13.40 -
   13.41  JAVA=${TESTJAVA}${FS}bin${FS}java
   13.42  
   13.43  # LD_PRELOAD arch needs to match the binary we run, so run the java
   13.44 @@ -97,7 +85,7 @@
   13.45    ;; 
   13.46  esac
   13.47  
   13.48 -LIBJSIG=${TESTJAVA}${FS}jre${FS}lib${FS}${ARCH}${FS}libjsig.so
   13.49 +LIBJSIG=${COMPILEJAVA}${FS}jre${FS}lib${FS}${ARCH}${FS}libjsig.so
   13.50  
   13.51  # If libjsig and binary do not match, skip test.
   13.52

    14.1 --- a/test/runtime/7107135/Test7107135.sh	Thu Mar 28 09:07:44 2013 +0100
    14.2 +++ b/test/runtime/7107135/Test7107135.sh	Thu Mar 28 15:42:11 2013 -0700
    14.3 @@ -32,26 +32,19 @@
    14.4  ##
    14.5  
    14.6  if [ "${TESTSRC}" = "" ]
    14.7 -then TESTSRC=.
    14.8 +then
    14.9 +  TESTSRC=${PWD}
   14.10 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
   14.11  fi
   14.12 -
   14.13 -if [ "${TESTJAVA}" = "" ]
   14.14 -then
   14.15 -  PARENT=`dirname \`which java\``
   14.16 -  TESTJAVA=`dirname ${PARENT}`
   14.17 -  echo "TESTJAVA not set, selecting " ${TESTJAVA}
   14.18 -  echo "If this is incorrect, try setting the variable manually."
   14.19 -fi
   14.20 -
   14.21 -BIT_FLAG=""
   14.22 +echo "TESTSRC=${TESTSRC}"
   14.23 +## Adding common setup Variables for running shell tests.
   14.24 +. ${TESTSRC}/../../test_env.sh
   14.25  
   14.26  # set platform-dependent variables
   14.27  OS=`uname -s`
   14.28  case "$OS" in
   14.29    Linux)
   14.30 -    NULL=/dev/null
   14.31 -    PS=":"
   14.32 -    FS="/"
   14.33 +    echo "Testing on Linux"
   14.34      ;;
   14.35    *)
   14.36      NULL=NUL
   14.37 @@ -64,7 +57,7 @@
   14.38  
   14.39  ARCH=`uname -m`
   14.40  
   14.41 -THIS_DIR=`pwd`
   14.42 +THIS_DIR=.
   14.43  
   14.44  cp ${TESTSRC}${FS}*.java ${THIS_DIR}
   14.45  ${TESTJAVA}${FS}bin${FS}javac *.java

    15.1 --- a/test/runtime/7110720/Test7110720.sh	Thu Mar 28 09:07:44 2013 +0100
    15.2 +++ b/test/runtime/7110720/Test7110720.sh	Thu Mar 28 15:42:11 2013 -0700
    15.3 @@ -12,22 +12,13 @@
    15.4  #
    15.5  
    15.6  if [ "${TESTSRC}" = "" ]
    15.7 -  then TESTSRC=.
    15.8 +then
    15.9 +  TESTSRC=${PWD}
   15.10 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
   15.11  fi
   15.12 -
   15.13 -if [ "${TESTJAVA}" = "" ]
   15.14 -then
   15.15 -  PARENT=`dirname \`which java\``
   15.16 -  TESTJAVA=`dirname ${PARENT}`
   15.17 -  echo "TESTJAVA not set, selecting " ${TESTJAVA}
   15.18 -  echo "If this is incorrect, try setting the variable manually."
   15.19 -fi
   15.20 -
   15.21 -if [ "${TESTCLASSES}" = "" ]
   15.22 -then
   15.23 -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
   15.24 -  exit 1
   15.25 -fi
   15.26 +echo "TESTSRC=${TESTSRC}"
   15.27 +## Adding common setup Variables for running shell tests.
   15.28 +. ${TESTSRC}/../../test_env.sh
   15.29  
   15.30  # Jtreg sets TESTVMOPTS which may include -d64 which is
   15.31  # required to test a 64-bit JVM on some platforms.

    16.1 --- a/test/runtime/7158804/Test7158804.sh	Thu Mar 28 09:07:44 2013 +0100
    16.2 +++ b/test/runtime/7158804/Test7158804.sh	Thu Mar 28 15:42:11 2013 -0700
    16.3 @@ -10,13 +10,14 @@
    16.4  ## @summary Improve config file parsing
    16.5  ## @run shell Test7158804.sh
    16.6  ##
    16.7 -
    16.8 -if [ "${TESTJAVA}" = "" ]
    16.9 +if [ "${TESTSRC}" = "" ]
   16.10  then
   16.11 -  echo "TESTJAVA not set.  Test cannot execute.  Failed."
   16.12 -  exit 1
   16.13 +  TESTSRC=${PWD}
   16.14 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
   16.15  fi
   16.16 -echo "TESTJAVA=${TESTJAVA}"
   16.17 +echo "TESTSRC=${TESTSRC}"
   16.18 +## Adding common setup Variables for running shell tests.
   16.19 +. ${TESTSRC}/../../test_env.sh
   16.20  
   16.21  rm -f .hotspotrc
   16.22  echo -XX:+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >.hotspotrc

    17.1 --- a/test/runtime/7162488/Test7162488.sh	Thu Mar 28 09:07:44 2013 +0100
    17.2 +++ b/test/runtime/7162488/Test7162488.sh	Thu Mar 28 15:42:11 2013 -0700
    17.3 @@ -29,27 +29,13 @@
    17.4  #
    17.5  
    17.6  if [ "${TESTSRC}" = "" ]
    17.7 -  then TESTSRC=.
    17.8 +then
    17.9 +  TESTSRC=${PWD}
   17.10 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
   17.11  fi
   17.12 -
   17.13 -if [ "${TESTJAVA}" = "" ]
   17.14 -then
   17.15 -  PARENT=`dirname \`which java\``
   17.16 -  TESTJAVA=`dirname ${PARENT}`
   17.17 -  printf "TESTJAVA not set, selecting " ${TESTJAVA}
   17.18 -  printf "  If this is incorrect, try setting the variable manually.\n"
   17.19 -fi
   17.20 -
   17.21 -# set platform-dependent variables
   17.22 -OS=`uname -s`
   17.23 -case "$OS" in
   17.24 -  Windows_* )
   17.25 -    FS="\\"
   17.26 -    ;;
   17.27 -  * )
   17.28 -    FS="/"
   17.29 -    ;;
   17.30 -esac
   17.31 +echo "TESTSRC=${TESTSRC}"
   17.32 +## Adding common setup Variables for running shell tests.
   17.33 +. ${TESTSRC}/../../test_env.sh
   17.34  
   17.35  JAVA=${TESTJAVA}${FS}bin${FS}java
   17.36

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/test/test_env.sh	Thu Mar 28 15:42:11 2013 -0700
    18.3 @@ -0,0 +1,193 @@
    18.4 +#!/bin/sh
    18.5 +#
    18.6 +#  Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    18.7 +#  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.8 +# 
    18.9 +#  This code is free software; you can redistribute it and/or modify it
   18.10 +#  under the terms of the GNU General Public License version 2 only, as
   18.11 +#  published by the Free Software Foundation.
   18.12 +# 
   18.13 +#  This code is distributed in the hope that it will be useful, but WITHOUT
   18.14 +#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   18.15 +#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   18.16 +#  version 2 for more details (a copy is included in the LICENSE file that
   18.17 +#  accompanied this code).
   18.18 +# 
   18.19 +#  You should have received a copy of the GNU General Public License version
   18.20 +#  2 along with this work; if not, write to the Free Software Foundation,
   18.21 +#  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   18.22 +# 
   18.23 +#  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   18.24 +#  or visit www.oracle.com if you need additional information or have any
   18.25 +#  questions.
   18.26 +# 
   18.27 +
   18.28 +#
   18.29 +# This Environment script was written to capture typically used environment
   18.30 +# setup for a given shell test. 
   18.31 +#
   18.32 +
   18.33 +# TESTJAVA can be a JDK or JRE. If JRE you need to set COMPILEJAVA
   18.34 +if [ "${TESTJAVA}" = "" ]
   18.35 +then
   18.36 +  echo "TESTJAVA not set.  Test cannot execute.  Failed."
   18.37 +  exit 1
   18.38 +fi
   18.39 +echo "TESTJAVA=${TESTJAVA}"
   18.40 +
   18.41 +# COMPILEJAVA requires a JDK, some shell test use javac,jar,etc 
   18.42 +if [ "${COMPILEJAVA}" = "" ]
   18.43 +then
   18.44 + echo "COMPILEJAVA not set.  Using TESTJAVA as default"
   18.45 + COMPILEJAVA=${TESTJAVA}
   18.46 +fi
   18.47 +echo "COMPILEJAVA=${COMPILEJAVA}"
   18.48 +
   18.49 +if [ "${TESTCLASSES}" = "" ]
   18.50 +then
   18.51 +  echo "TESTCLASES not set.  Using "." as default"
   18.52 +  TESTCLASSES=.
   18.53 +fi
   18.54 +echo "TESTCLASSES=${TESTCLASSES}"
   18.55 +
   18.56 +# set platform-dependent variables
   18.57 +OS=`uname -s`
   18.58 +case "$OS" in
   18.59 +  SunOS | Linux | Darwin )
   18.60 +    NULL=/dev/null
   18.61 +    PS=":"
   18.62 +    FS="/"
   18.63 +    RM=/bin/rm
   18.64 +    CP=/bin/cp
   18.65 +    MV=/bin/mv
   18.66 +    ;;
   18.67 +  Windows_* )
   18.68 +    NULL=NUL
   18.69 +    PS=";"
   18.70 +    FS="\\"
   18.71 +    RM=rm
   18.72 +    CP=cp
   18.73 +    MV=mv
   18.74 +    ;;
   18.75 +  CYGWIN_* )
   18.76 +    NULL=/dev/null
   18.77 +    PS=";"
   18.78 +    FS="/"
   18.79 +    RM=rm
   18.80 +    CP=cp
   18.81 +    MV=mv
   18.82 +    ;;
   18.83 +  * )
   18.84 +    echo "Unrecognized system!"
   18.85 +    exit 1;
   18.86 +    ;;
   18.87 +esac
   18.88 +
   18.89 +export NULL PS FS RM CP MV
   18.90 +echo "NULL =${NULL}"
   18.91 +echo "PS =${PS}"
   18.92 +echo "FS =${FS}"
   18.93 +echo "RM =${RM}"
   18.94 +echo "CP =${CP}"
   18.95 +echo "MV =${MV}"
   18.96 +
   18.97 +# jtreg -classpathappend:<path>
   18.98 +JEMMYPATH=${CPAPPEND}
   18.99 +CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
  18.100 +echo "CLASSPATH =${CLASSPATH}"
  18.101 +
  18.102 +# Current directory is scratch directory 
  18.103 +THIS_DIR=.
  18.104 +echo "THIS_DIR=${THIS_DIR}"
  18.105 +
  18.106 +# Check to ensure the java defined actually works
  18.107 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -version
  18.108 +if [ $? != 0 ]; then
  18.109 +  echo "Wrong TESTJAVA or TESTVMOPTS:"
  18.110 +  echo $TESTJAVA TESTVMOPTS
  18.111 +  exit 1
  18.112 +fi
  18.113 +
  18.114 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Xinternalversion > vm_version.out 2>&1
  18.115 +
  18.116 +VM_TYPE="unknown"
  18.117 +grep "Server" vm_version.out > ${NULL}
  18.118 +if [ $? = 0 ]
  18.119 +then
  18.120 +  VM_TYPE="server"
  18.121 +fi
  18.122 +grep "Client" vm_version.out > ${NULL}
  18.123 +if [ $? = 0 ]
  18.124 +then
  18.125 +  VM_TYPE="client"
  18.126 +fi
  18.127 +
  18.128 +VM_BITS="32"
  18.129 +grep "64-Bit" vm_version.out > ${NULL}
  18.130 +if [ $? = 0 ]
  18.131 +then
  18.132 +  VM_BITS="64"
  18.133 +fi
  18.134 +
  18.135 +VM_OS="unknown"
  18.136 +grep "solaris" vm_version.out > ${NULL}
  18.137 +if [ $? = 0 ]
  18.138 +then
  18.139 +  VM_OS="solaris"
  18.140 +fi
  18.141 +grep "linux" vm_version.out > ${NULL}
  18.142 +if [ $? = 0 ]
  18.143 +then
  18.144 +  VM_OS="linux"
  18.145 +fi
  18.146 +grep "windows" vm_version.out > ${NULL}
  18.147 +if [ $? = 0 ]
  18.148 +then
  18.149 +  VM_OS="windows"
  18.150 +fi
  18.151 +grep "bsd" vm_version.out > ${NULL}
  18.152 +if [ $? = 0 ]
  18.153 +then
  18.154 +  VM_OS="bsd"
  18.155 +fi
  18.156 +
  18.157 +VM_CPU="unknown"
  18.158 +grep "sparc" vm_version.out > ${NULL}
  18.159 +if [ $? = 0 ]
  18.160 +then
  18.161 +  VM_CPU="sparc"
  18.162 +  if [ $VM_BITS = "64" ]
  18.163 +  then
  18.164 +    VM_CPU="sparcv9"
  18.165 +  fi
  18.166 +fi
  18.167 +grep "x86" vm_version.out > ${NULL}
  18.168 +if [ $? = 0 ]
  18.169 +then
  18.170 +  VM_CPU="i386"
  18.171 +fi
  18.172 +grep "amd64" vm_version.out > ${NULL}
  18.173 +if [ $? = 0 ]
  18.174 +then
  18.175 +  VM_CPU="amd64"
  18.176 +fi
  18.177 +grep "arm" vm_version.out > ${NULL}
  18.178 +if [ $? = 0 ]
  18.179 +then
  18.180 +  VM_CPU="arm"
  18.181 +fi
  18.182 +grep "ppc" vm_version.out > ${NULL}
  18.183 +if [ $? = 0 ]
  18.184 +then
  18.185 +  VM_CPU="ppc"
  18.186 +fi
  18.187 +grep "ia64" vm_version.out > ${NULL}
  18.188 +if [ $? = 0 ]
  18.189 +then
  18.190 +  VM_CPU="ia64"
  18.191 +fi
  18.192 +export VM_TYPE VM_BITS VM_OS VM_CPU
  18.193 +echo "VM_TYPE=${VM_TYPE}"
  18.194 +echo "VM_BITS=${VM_BITS}"
  18.195 +echo "VM_OS=${VM_OS}"
  18.196 +echo "VM_CPU=${VM_CPU}"

Mercurial > jdk8-mips64-public > hotspot / changeset

changeset

Merge