rev 4502 : 7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option
Summary: Small changes to hotspot tests to remove  "-server" and replace with ${TESTVMOPTS}
Reviewed-by: kvn
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

          --- old/test/compiler/7068051/Test7068051.sh
          +++ new/test/compiler/7068051/Test7068051.sh

   1    1  #!/bin/sh
   2    2  # 
   3    3  # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   4    4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   5    5  # 
   6    6  # This code is free software; you can redistribute it and/or modify it
   7    7  # under the terms of the GNU General Public License version 2 only, as
   8    8  # published by the Free Software Foundation.
   9    9  # 
  10   10  # This code is distributed in the hope that it will be useful, but WITHOUT
  11   11  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  12   12  # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  13   13  # version 2 for more details (a copy is included in the LICENSE file that
  14   14  # accompanied this code).

  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}"
       32 +## Adding common setup Variables for running shell tests.
       33 +. ${TESTSRC}/../../test_env.sh
  38   34  
  39   35  set -x
  40   36  
  41      -${TESTJAVA}/bin/jar xf ${TESTJAVA}/jre/lib/javaws.jar
  42      -${TESTJAVA}/bin/jar cf foo.jar *
       37 +${COMPILEJAVA}/bin/jar xf ${COMPILEJAVA}/jre/lib/javaws.jar
       38 +${COMPILEJAVA}/bin/jar cf foo.jar *
  43   39  cp ${TESTSRC}/Test7068051.java ./
  44      -${TESTJAVA}/bin/jar -uf0 foo.jar Test7068051.java
       40 +${COMPILEJAVA}/bin/jar -uf0 foo.jar Test7068051.java
  45   41  
  46      -${TESTJAVA}/bin/javac -d . Test7068051.java
       42 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7068051.java
  47   43  
  48      -${TESTJAVA}/bin/java -showversion -Xbatch ${TESTVMOPTS} Test7068051 foo.jar
       44 +${TESTJAVA}/bin/java ${TESTVMOPTS} -showversion -Xbatch Test7068051 foo.jar
  49   45  
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX