From 68172430eb0ea342954d403e6d1cb264c65f8c54 Mon Sep 17 00:00:00 2001
From: jjh <unknown>
Date: Fri, 1 Aug 2008 13:58:29 -0700
Subject: [PATCH] 6730273: TEST: JDI_REGRESSION test
 Solaris32AndSolaris64Test.sh fails if -XX:+UseCompressedOops is used Summary:
 Fix test to not pass -XX:[+-]UseCompressedOops to the debuggee. Reviewed-by:
 tbell

---
 test/com/sun/jdi/Solaris32AndSolaris64Test.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/com/sun/jdi/Solaris32AndSolaris64Test.sh b/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
index 5ddb871b2..37be2781d 100644
--- a/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
+++ b/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
@@ -25,7 +25,7 @@
 
 #
 #   @test       Solaris32AndSolaris64Test.sh
-#   @bug        4478312 4780570 4913748
+#   @bug        4478312 4780570 4913748 6730273
 #   @summary    Test debugging with mixed 32/64bit VMs.
 #   @author     Tim Bell
 #   Based on test/java/awt/TEMPLATE/AutomaticShellTest.sh
@@ -177,8 +177,14 @@ filename=$TESTCLASSES/@debuggeeVMOptions
 if [ ! -r ${filename} ] ; then
     filename=$TESTCLASSES/../@debuggeeVMOptions
 fi
+# Remove -d32, -d64 if present, and remove -XX:[+-]UseCompressedOops 
+# if present since it is illegal in 32 bit mode.
 if [ -r ${filename} ] ; then
-    DEBUGGEEFLAGS=`cat ${filename} | sed -e 's/-d32//g' -e 's/-d64//g'`
+    DEBUGGEEFLAGS=`cat ${filename} | sed \
+                        -e 's/-d32//g' \
+                        -e 's/-d64//g' \
+                        -e 's/-XX:.UseCompressedOops//g' \
+                        `
 fi
 
 #
-- 
GitLab