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/Test6890943.sh
+++ new/test/compiler/5091921/Test6890943.sh
1 1 #!/bin/sh
2 2 #
3 3 # Copyright (c) 2011, 2013, 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).
↓ 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
35 +
46 36 set -x
47 37
48 38 cp ${TESTSRC}/Test6890943.java .
49 39 cp ${TESTSRC}/input6890943.txt .
50 40 cp ${TESTSRC}/output6890943.txt .
51 41 cp ${TESTSRC}/Test6890943.sh .
52 42
53 -${TESTJAVA}/bin/javac -d . Test6890943.java
43 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test6890943.java
54 44
55 45 ${TESTJAVA}/bin/java -XX:-PrintVMOptions -XX:+IgnoreUnrecognizedVMOptions ${TESTVMOPTS} Test6890943 < input6890943.txt > pretest.out 2>&1
56 46
57 47 # This test sometimes tickles an unrelated performance warning that interferes with diff.
58 48 grep -v 'warning: Performance bug: SystemDictionary' pretest.out > test.out
59 49
60 50 diff output6890943.txt test.out
61 51
62 52 result=$?
63 53 if [ $result -eq 0 ]
64 54 then
65 55 echo "Passed"
66 56 exit 0
67 57 else
68 58 echo "Failed"
69 59 exit 1
70 60 fi
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX