Print this page
rev 4503 : 8009152: A number of jtreg tests need review/improvement
Summary: Added a new test_env.txt file to capture common shell variable. Added concept of COMPILEJAVA for use when TESTJAVA is a JRE. If COMPILEJAVA not set then TESTJAVA will be the default with assumption it is a JDK.
Reviewed-by: kvn, brutisso, coleenp

Split Split Close
Expand all
Collapse all
          --- old/test/runtime/7110720/Test7110720.sh
          +++ new/test/runtime/7110720/Test7110720.sh
↓ open down ↓ 4 lines elided ↑ open up ↑
   5    5  
   6    6  
   7    7  #
   8    8  # @test Test7110720.sh
   9    9  # @bug 7110720
  10   10  # @summary improve VM configuration file loading
  11   11  # @run shell Test7110720.sh
  12   12  #
  13   13  
  14   14  if [ "${TESTSRC}" = "" ]
  15      -  then TESTSRC=.
  16      -fi
  17      -
  18      -if [ "${TESTJAVA}" = "" ]
  19   15  then
  20      -  PARENT=`dirname \`which java\``
  21      -  TESTJAVA=`dirname ${PARENT}`
  22      -  echo "TESTJAVA not set, selecting " ${TESTJAVA}
  23      -  echo "If this is incorrect, try setting the variable manually."
       16 +  TESTSRC=${PWD}
       17 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
  24   18  fi
       19 +echo "TESTSRC=${TESTSRC}"
       20 +## Adding common setup Variables for running shell tests.
       21 +. ${TESTSRC}/../../test_env.sh
  25   22  
  26      -if [ "${TESTCLASSES}" = "" ]
  27      -then
  28      -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
  29      -  exit 1
  30      -fi
  31      -
  32   23  # Jtreg sets TESTVMOPTS which may include -d64 which is
  33   24  # required to test a 64-bit JVM on some platforms.
  34   25  # If another test harness still creates HOME/JDK64BIT,
  35   26  # we can recognise that.
  36   27  
  37   28  # set platform-dependent variables
  38   29  OS=`uname -s`
  39   30  case "$OS" in
  40   31    SunOS | Linux | Darwin )
  41   32      FS="/"
↓ open down ↓ 87 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX