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
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).
↓ 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}'`
55 44 elif [ -x "/usr/sbin/system_profiler" ]; then
56 45 # MacOS
57 46 MEMo=`/usr/sbin/system_profiler SPHardwareDataType | grep Memory:`
58 47 MEM=`echo "$MEMo" | awk '{print $2}'`
59 48 MEMu=`echo "$MEMo" | awk '{print $3}'`
60 49 case $MEMu in
61 50 GB)
62 51 MEM="$(($MEM * 1024))"
63 52 ;;
64 53 MB)
65 54 ;;
66 55 *)
67 56 echo "Unknown memory unit in system_profile output: $MEMu"
68 57 ;;
69 58 esac
70 59 elif [ -n "$ROOTDIR" -a -x "$ROOTDIR/mksnt/sysinf" ]; then
71 60 # Windows/MKS
72 61 MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
73 62 MEM="$(($machine_memory / 1024))"
74 63 else
75 64 echo "Unable to determine amount of physical memory on the machine"
76 65 fi
77 66
78 67 if [ $MEM -lt 2000 ]; then
79 68 echo "Test skipped due to low (or unknown) memory on the system: $MEM Mb"
↓ 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"
101 90 exit 0
102 91 fi
103 92
104 93 if [ $result -eq 97 ]
105 94 then
106 95 echo "Failed"
107 96 exit 1
108 97 fi
109 98
110 99 # The test should pass when no enough space for object heap
111 100 grep "Could not reserve enough space for object heap" test.out
112 101 if [ $? = 0 ]
113 102 then
114 103 echo "Passed"
115 104 exit 0
116 105 else
117 106 echo "Failed"
118 107 exit 1
119 108 fi
↓ open down ↓ |
19 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX