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/compiler/5091921/Test7005594.sh
          +++ new/test/compiler/5091921/Test7005594.sh
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15  # 
  16   16  # You should have received a copy of the GNU General Public License version
  17   17  # 2 along with this work; if not, write to the Free Software Foundation,
  18   18  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  19   19  # 
  20   20  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  21   21  # or visit www.oracle.com if you need additional information or have any
  22   22  # questions.
  23   23  # 
  24   24  # 
  25      -
       25 +## some tests require path to find test source dir
  26   26  if [ "${TESTSRC}" = "" ]
  27   27  then
  28      -  echo "TESTSRC not set.  Test cannot execute.  Failed."
  29      -  exit 1
       28 +  TESTSRC=${PWD}
       29 +  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
  30   30  fi
  31   31  echo "TESTSRC=${TESTSRC}"
  32      -if [ "${TESTJAVA}" = "" ]
  33      -then
  34      -  echo "TESTJAVA not set.  Test cannot execute.  Failed."
  35      -  exit 1
  36      -fi
  37      -echo "TESTJAVA=${TESTJAVA}"
  38      -if [ "${TESTCLASSES}" = "" ]
  39      -then
  40      -  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
  41      -  exit 1
  42      -fi
  43      -echo "TESTCLASSES=${TESTCLASSES}"
  44      -echo "CLASSPATH=${CLASSPATH}"
       32 +## Adding common setup Variables for running shell tests.
       33 +. ${TESTSRC}/../../test_env.sh
  45   34  
  46   35  # Amount of physical memory in megabytes
  47   36  MEM=0
  48   37  if [ -f "/proc/meminfo" ]; then
  49   38    # Linux, Windows/Cygwin
  50   39    MEM=`cat /proc/meminfo |grep ^MemTotal: | awk '{print $2}'`
  51   40    MEM="$(($MEM / 1024))"
  52   41  elif [ -x "/usr/sbin/prtconf" ]; then
  53   42    # Solaris
  54   43    MEM=`/usr/sbin/prtconf | grep "^Memory size" | awk '{print $3}'`
↓ open down ↓ 25 lines elided ↑ open up ↑
  80   69    exit 0
  81   70  fi
  82   71  
  83   72  echo "MEMORY=$MEM Mb"
  84   73  
  85   74  set -x
  86   75  
  87   76  cp ${TESTSRC}/Test7005594.java .
  88   77  cp ${TESTSRC}/Test7005594.sh .
  89   78  
  90      -${TESTJAVA}/bin/javac -d . Test7005594.java
       79 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7005594.java
  91   80  
  92   81  ${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
  93   82  
  94   83  result=$?
  95   84  
  96   85  cat test.out
  97   86  
  98   87  if [ $result -eq 95 ]
  99   88  then
 100   89    echo "Passed"
↓ open down ↓ 19 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX