From 48a555a2d40050da730b5c6911b11b8d06298c07 Mon Sep 17 00:00:00 2001
From: dcubed <unknown>
Date: Wed, 5 Aug 2009 13:17:30 -0600
Subject: [PATCH] 6868533: 3/4 JDI: remove '-source 1.5' and '-target 1.5'
 options from com.sun.jdi tests Summary: We are long past needing to make sure
 these tests can build on Tiger/JDK1.5.0. Reviewed-by: tbell

---
 test/com/sun/jdi/EnumTest.java     | 2 +-
 test/com/sun/jdi/GenericsTest.java | 2 +-
 test/com/sun/jdi/JdbVarargsTest.sh | 1 -
 test/com/sun/jdi/StepTest.java     | 2 +-
 test/com/sun/jdi/UTF8Test.java     | 2 +-
 test/com/sun/jdi/VarargsTest.java  | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/com/sun/jdi/EnumTest.java b/test/com/sun/jdi/EnumTest.java
index be06c0f45..51d3a976a 100644
--- a/test/com/sun/jdi/EnumTest.java
+++ b/test/com/sun/jdi/EnumTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -source 1.5 -target 1.5 -g EnumTest.java
+ *  @run compile -g EnumTest.java
  *  @run main EnumTest
  */
 import com.sun.jdi.*;
diff --git a/test/com/sun/jdi/GenericsTest.java b/test/com/sun/jdi/GenericsTest.java
index 2220dd7bb..5156e9d8e 100644
--- a/test/com/sun/jdi/GenericsTest.java
+++ b/test/com/sun/jdi/GenericsTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -source 1.5 -target 1.5 -g GenericsTest.java
+ *  @run compile -g GenericsTest.java
  *  @run main GenericsTest
  */
 import com.sun.jdi.*;
diff --git a/test/com/sun/jdi/JdbVarargsTest.sh b/test/com/sun/jdi/JdbVarargsTest.sh
index 72d9561f5..82e0b18e6 100644
--- a/test/com/sun/jdi/JdbVarargsTest.sh
+++ b/test/com/sun/jdi/JdbVarargsTest.sh
@@ -32,7 +32,6 @@
 #  @run shell JdbVarargsTest.sh
 
 classname=JdbVarargsTest
-compileOptions="-source 1.5 -target 1.5"
 createJavaFile()
 {
     cat <<EOF > $classname.java.1
diff --git a/test/com/sun/jdi/StepTest.java b/test/com/sun/jdi/StepTest.java
index 9c2344d09..041507a8b 100644
--- a/test/com/sun/jdi/StepTest.java
+++ b/test/com/sun/jdi/StepTest.java
@@ -27,7 +27,7 @@
  *  @author Gordon Hirsch
  *
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
- *  @run compile -g -target 1.5 MethodCalls.java
+ *  @run compile -g MethodCalls.java
  *  @run compile -g MethodCallsReflection.java
  *  @run compile -g ControlFlow.java
  *  @run build StepTest
diff --git a/test/com/sun/jdi/UTF8Test.java b/test/com/sun/jdi/UTF8Test.java
index b7b286658..4396770e0 100644
--- a/test/com/sun/jdi/UTF8Test.java
+++ b/test/com/sun/jdi/UTF8Test.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -g -source 1.5 UTF8Test.java
+ *  @run compile -g UTF8Test.java
  *  @run main UTF8Test
  */
 
diff --git a/test/com/sun/jdi/VarargsTest.java b/test/com/sun/jdi/VarargsTest.java
index ed4323e2d..1ea51ad24 100644
--- a/test/com/sun/jdi/VarargsTest.java
+++ b/test/com/sun/jdi/VarargsTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -g -source 1.5 -target 1.5 VarargsTest.java
+ *  @run compile -g VarargsTest.java
  *  @run main VarargsTest
  */
 import com.sun.jdi.*;
-- 
GitLab