equal
deleted
inserted
replaced
23 # have any questions. |
23 # have any questions. |
24 # |
24 # |
25 |
25 |
26 # |
26 # |
27 # @test Solaris32AndSolaris64Test.sh |
27 # @test Solaris32AndSolaris64Test.sh |
28 # @bug 4478312 4780570 4913748 |
28 # @bug 4478312 4780570 4913748 6730273 |
29 # @summary Test debugging with mixed 32/64bit VMs. |
29 # @summary Test debugging with mixed 32/64bit VMs. |
30 # @author Tim Bell |
30 # @author Tim Bell |
31 # Based on test/java/awt/TEMPLATE/AutomaticShellTest.sh |
31 # Based on test/java/awt/TEMPLATE/AutomaticShellTest.sh |
32 # |
32 # |
33 # @run build TestScaffold VMConnection TargetListener TargetAdapter |
33 # @run build TestScaffold VMConnection TargetListener TargetAdapter |
175 DEBUGGEEFLAGS= |
175 DEBUGGEEFLAGS= |
176 filename=$TESTCLASSES/@debuggeeVMOptions |
176 filename=$TESTCLASSES/@debuggeeVMOptions |
177 if [ ! -r ${filename} ] ; then |
177 if [ ! -r ${filename} ] ; then |
178 filename=$TESTCLASSES/../@debuggeeVMOptions |
178 filename=$TESTCLASSES/../@debuggeeVMOptions |
179 fi |
179 fi |
|
180 # Remove -d32, -d64 if present, and remove -XX:[+-]UseCompressedOops |
|
181 # if present since it is illegal in 32 bit mode. |
180 if [ -r ${filename} ] ; then |
182 if [ -r ${filename} ] ; then |
181 DEBUGGEEFLAGS=`cat ${filename} | sed -e 's/-d32//g' -e 's/-d64//g'` |
183 DEBUGGEEFLAGS=`cat ${filename} | sed \ |
|
184 -e 's/-d32//g' \ |
|
185 -e 's/-d64//g' \ |
|
186 -e 's/-XX:.UseCompressedOops//g' \ |
|
187 ` |
182 fi |
188 fi |
183 |
189 |
184 # |
190 # |
185 CLASSPATH="$TESTJAVA/lib/tools.jar${PATHSEP}${TESTCLASSES}" |
191 CLASSPATH="$TESTJAVA/lib/tools.jar${PATHSEP}${TESTCLASSES}" |
186 export CLASSPATH |
192 export CLASSPATH |