From 1b48722e087eaadfaa5367cf9b09d30409ff5957 Mon Sep 17 00:00:00 2001 From: darcy Date: Thu, 3 Dec 2009 18:19:10 -0800 Subject: [PATCH] 6907177: Update jdk tests to remove unncessary -source and -target options Reviewed-by: ohair --- jdk/test/demo/jvmti/hprof/CpuOldTest.java | 2 +- jdk/test/demo/jvmti/hprof/CpuSamplesTest.java | 2 +- jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java | 2 +- jdk/test/demo/jvmti/hprof/CpuTimesTest.java | 2 +- jdk/test/demo/jvmti/hprof/HeapAllTest.java | 2 +- jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java | 2 +- jdk/test/demo/jvmti/hprof/HeapDumpTest.java | 2 +- jdk/test/demo/jvmti/hprof/HeapSitesTest.java | 2 +- jdk/test/demo/jvmti/hprof/OptionsTest.java | 2 +- jdk/test/java/io/Serializable/enum/array/Test.java | 3 --- jdk/test/java/io/Serializable/enum/badResolve/Write.java | 4 ++-- jdk/test/java/io/Serializable/enum/basic/Test.java | 3 --- jdk/test/java/io/Serializable/enum/classObject/Test.java | 3 --- .../java/io/Serializable/enum/constantSubclasses/Write.java | 4 ++-- .../io/Serializable/enum/ignoreSerializationFields/Test.java | 3 --- .../io/Serializable/enum/ignoreSerializationMethods/Test.java | 3 --- .../java/io/Serializable/enum/mismatchedTypecode/Test.java | 3 --- jdk/test/java/io/Serializable/enum/missingConstant/Write.java | 4 ++-- jdk/test/java/io/Serializable/enum/unshared/Test.java | 3 --- jdk/test/java/lang/Boolean/MakeBooleanComparable.java | 3 --- jdk/test/java/lang/Class/Cast.java | 3 --- jdk/test/java/lang/Class/IsEnum.java | 2 -- jdk/test/java/lang/Class/asSubclass/BasicUnit.java | 2 +- jdk/test/java/lang/ClassLoader/Assert.sh | 2 +- jdk/test/java/lang/Integer/BitTwiddle.java | 3 --- jdk/test/java/lang/Long/BitTwiddle.java | 3 --- jdk/test/java/lang/Math/Atan2Tests.java | 2 -- jdk/test/java/lang/Math/IeeeRecommendedTests.java | 2 -- jdk/test/java/lang/Math/PowTests.java | 2 -- jdk/test/java/lang/Math/TanTests.java | 2 -- jdk/test/java/lang/Runtime/exec/WinCommand.java | 3 --- jdk/test/java/lang/Thread/GenerifyStackTraces.java | 3 --- jdk/test/java/lang/Thread/UncaughtExceptions.sh | 2 +- jdk/test/java/lang/annotation/UnitTest.java | 2 -- jdk/test/java/lang/annotation/package-info.java | 2 +- .../CompositeData/MemoryNotifInfoCompositeData.java | 2 +- .../management/CompositeData/ThreadInfoCompositeData.java | 2 +- .../lang/management/ManagementFactory/MXBeanProxyTest.java | 3 --- .../management/ManagementFactory/PlatformMBeanServerTest.java | 3 --- .../lang/management/ManagementFactory/ProxyExceptions.java | 3 --- .../lang/management/ManagementFactory/ProxyTypeMapping.java | 2 +- .../lang/management/ManagementFactory/ValidateOpenTypes.java | 2 +- .../lang/management/RuntimeMXBean/GetSystemProperties.java | 3 --- .../java/lang/management/RuntimeMXBean/TestInputArgument.sh | 2 +- jdk/test/java/lang/reflect/Constructor/GenericStringTest.java | 2 -- jdk/test/java/lang/reflect/Field/GenericStringTest.java | 2 -- jdk/test/java/lang/reflect/Generics/StringsAndBounds.java | 2 -- jdk/test/java/lang/reflect/Generics/TestC1.java | 2 +- jdk/test/java/lang/reflect/Generics/TestC2.java | 2 +- jdk/test/java/lang/reflect/Generics/TestN1.java | 2 +- jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java | 2 -- jdk/test/java/lang/reflect/Generics/getAnnotationTest.java | 2 -- jdk/test/java/lang/reflect/Method/Equals.java | 2 +- jdk/test/java/lang/reflect/Method/GenericStringTest.java | 2 -- jdk/test/java/math/BigDecimal/DivideTests.java | 2 -- jdk/test/java/math/BigDecimal/IntegralDivisionTests.java | 2 -- jdk/test/java/math/BigDecimal/PowTests.java | 2 -- jdk/test/java/math/BigDecimal/ToPlainStringTests.java | 2 -- jdk/test/java/math/BigDecimal/ZeroScalingTests.java | 2 -- jdk/test/java/math/RoundingMode/RoundingModeTests.java | 2 -- jdk/test/java/net/ProxySelector/ProxyTest.java | 2 +- jdk/test/java/net/URL/PerConnectionProxy.java | 2 +- .../cert/PKIXBuilderParameters/InvalidParameters.java | 2 +- .../java/security/cert/PKIXParameters/InvalidParameters.java | 2 +- jdk/test/java/util/AbstractList/CheckForComodification.java | 2 -- jdk/test/java/util/Collections/AddAll.java | 3 --- jdk/test/java/util/Collections/Disjoint.java | 3 --- jdk/test/java/util/Collections/Frequency.java | 3 --- jdk/test/java/util/EnumMap/EnumMapBash.java | 3 --- jdk/test/java/util/EnumSet/AllOf.java | 3 --- jdk/test/java/util/EnumSet/ComplementOf.java | 3 --- jdk/test/java/util/EnumSet/EnumSetBash.java | 3 --- jdk/test/java/util/EnumSet/JumboRange.java | 3 --- jdk/test/java/util/EnumSet/Range.java | 3 --- jdk/test/java/util/Formattable/StockName.java | 4 +--- jdk/test/java/util/IdentityHashMap/ToString.java | 3 --- jdk/test/java/util/Locale/Bug4175998Test.java | 2 +- jdk/test/java/util/UUID/UUIDTest.java | 2 -- .../BlockingQueue/CancelledProducerConsumerLoops.java | 2 +- .../BlockingQueue/MultipleProducersSingleConsumerLoops.java | 2 +- .../util/concurrent/BlockingQueue/ProducerConsumerLoops.java | 2 +- .../BlockingQueue/SingleProducerMultipleConsumerLoops.java | 2 +- jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java | 2 +- jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java | 2 +- jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java | 2 +- .../ExecutorCompletionServiceLoops.java | 2 +- .../java/util/concurrent/FutureTask/CancelledFutureLoops.java | 2 +- jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java | 2 -- .../concurrent/locks/ReentrantLock/CancelledLockLoops.java | 2 +- .../locks/ReentrantLock/LockOncePerThreadLoops.java | 2 +- .../locks/ReentrantLock/SimpleReentrantLockLoops.java | 2 +- .../util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java | 2 -- .../concurrent/locks/ReentrantReadWriteLock/MapLoops.java | 2 +- jdk/test/sun/management/AgentCheckTest.java | 3 --- jdk/test/sun/security/util/Oid/S11N.sh | 2 +- jdk/test/sun/tools/jconsole/ResourceCheckTest.sh | 2 +- 96 files changed, 49 insertions(+), 179 deletions(-) diff --git a/jdk/test/demo/jvmti/hprof/CpuOldTest.java b/jdk/test/demo/jvmti/hprof/CpuOldTest.java index 378083a256..252aa05be1 100644 --- a/jdk/test/demo/jvmti/hprof/CpuOldTest.java +++ b/jdk/test/demo/jvmti/hprof/CpuOldTest.java @@ -26,7 +26,7 @@ * @bug 5012882 6299047 * @summary Test jvmti hprof * - * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java + * @compile -g HelloWorld.java ../DemoRun.java * @build CpuOldTest * @run main CpuOldTest HelloWorld */ diff --git a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java b/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java index 0c5317184e..d06d4cff33 100644 --- a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java +++ b/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java @@ -26,7 +26,7 @@ * @bug 5012882 * @summary Test jvmti hprof * - * @compile -source 1.5 -g:lines HelloWorld.java ../DemoRun.java + * @compile -g:lines HelloWorld.java ../DemoRun.java * @build CpuSamplesTest * @run main CpuSamplesTest HelloWorld */ diff --git a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java b/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java index 5a1b7d08b3..63cfcb3e5c 100644 --- a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java +++ b/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java @@ -26,7 +26,7 @@ * @bug 5097131 6299047 * @summary Test jvmti hprof * - * @compile -source 1.5 -g HelloWorld.java DefineClass.java ../DemoRun.java + * @compile -g HelloWorld.java DefineClass.java ../DemoRun.java * @build CpuTimesDefineClassTest * @run main CpuTimesDefineClassTest DefineClass * diff --git a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java b/jdk/test/demo/jvmti/hprof/CpuTimesTest.java index 7a9d10e815..a99d384494 100644 --- a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java +++ b/jdk/test/demo/jvmti/hprof/CpuTimesTest.java @@ -26,7 +26,7 @@ * @bug 5012882 6299047 * @summary Test jvmti hprof * - * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java + * @compile -g HelloWorld.java ../DemoRun.java * @build CpuTimesTest * @run main CpuTimesTest HelloWorld */ diff --git a/jdk/test/demo/jvmti/hprof/HeapAllTest.java b/jdk/test/demo/jvmti/hprof/HeapAllTest.java index ce4431f503..8de8714a02 100644 --- a/jdk/test/demo/jvmti/hprof/HeapAllTest.java +++ b/jdk/test/demo/jvmti/hprof/HeapAllTest.java @@ -26,7 +26,7 @@ * @bug 5012882 6299047 * @summary Test jvmti hprof * - * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java + * @compile -g HelloWorld.java ../DemoRun.java * @build HeapAllTest * @run main HeapAllTest HelloWorld */ diff --git a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java b/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java index 5f4f7b92b3..1d3366cfd9 100644 --- a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java +++ b/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java @@ -26,7 +26,7 @@ * @bug 4965057 6313381 * @summary Test jvmti hprof format=b * - * @compile -source 1.5 -g:source HelloWorld.java ../DemoRun.java + * @compile -g:source HelloWorld.java ../DemoRun.java * @build HeapBinaryFormatTest * @run main HeapBinaryFormatTest HelloWorld */ diff --git a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java b/jdk/test/demo/jvmti/hprof/HeapDumpTest.java index 1faca7ee6a..01cce60831 100644 --- a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java +++ b/jdk/test/demo/jvmti/hprof/HeapDumpTest.java @@ -26,7 +26,7 @@ * @bug 5012882 6299047 * @summary Test jvmti hprof * - * @compile -source 1.5 -g:source HelloWorld.java ../DemoRun.java + * @compile -g:source HelloWorld.java ../DemoRun.java * @build HeapDumpTest * @run main HeapDumpTest HelloWorld */ diff --git a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java b/jdk/test/demo/jvmti/hprof/HeapSitesTest.java index 31a3d7ef02..c0205e2377 100644 --- a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java +++ b/jdk/test/demo/jvmti/hprof/HeapSitesTest.java @@ -26,7 +26,7 @@ * @bug 5012882 6299047 * @summary Test jvmti hprof * - * @compile -source 1.5 -g:vars HelloWorld.java ../DemoRun.java + * @compile -g:vars HelloWorld.java ../DemoRun.java * @build HeapSitesTest * @run main HeapSitesTest HelloWorld */ diff --git a/jdk/test/demo/jvmti/hprof/OptionsTest.java b/jdk/test/demo/jvmti/hprof/OptionsTest.java index eae8276fcf..e1cac9ccd5 100644 --- a/jdk/test/demo/jvmti/hprof/OptionsTest.java +++ b/jdk/test/demo/jvmti/hprof/OptionsTest.java @@ -26,7 +26,7 @@ * @bug 5083441 6299047 * @summary Test jvmti hprof * - * @compile -source 1.5 -g:lines HelloWorld.java ../DemoRun.java + * @compile -g:lines HelloWorld.java ../DemoRun.java * @build OptionsTest * @run main OptionsTest HelloWorld */ diff --git a/jdk/test/java/io/Serializable/enum/array/Test.java b/jdk/test/java/io/Serializable/enum/array/Test.java index 705de3a44d..95d9cac890 100644 --- a/jdk/test/java/io/Serializable/enum/array/Test.java +++ b/jdk/test/java/io/Serializable/enum/array/Test.java @@ -25,9 +25,6 @@ * @bug 4838379 * @summary Verify that serialization of enum constant arrays functions * properly. - * - * @compile -source 1.5 Test.java - * @run main Test */ import java.io.*; diff --git a/jdk/test/java/io/Serializable/enum/badResolve/Write.java b/jdk/test/java/io/Serializable/enum/badResolve/Write.java index 24e0242d5f..dcdd5fa5aa 100644 --- a/jdk/test/java/io/Serializable/enum/badResolve/Write.java +++ b/jdk/test/java/io/Serializable/enum/badResolve/Write.java @@ -26,10 +26,10 @@ * @summary Verify that enum classes present in a serialization stream cannot * be resolved by the receiver to non-enum classes, and vice-versa. * - * @compile -source 1.5 Write.java + * @compile Write.java * @run main Write * @clean Write - * @compile -source 1.5 Read.java + * @compile Read.java * @run main Read * @clean Read */ diff --git a/jdk/test/java/io/Serializable/enum/basic/Test.java b/jdk/test/java/io/Serializable/enum/basic/Test.java index b8677750bb..5e8e8679c5 100644 --- a/jdk/test/java/io/Serializable/enum/basic/Test.java +++ b/jdk/test/java/io/Serializable/enum/basic/Test.java @@ -25,9 +25,6 @@ * @bug 4838379 * @summary Verify that basic serialization of non-specialized enum constants * functions properly. - * - * @compile -source 1.5 Test.java - * @run main Test */ import java.io.*; diff --git a/jdk/test/java/io/Serializable/enum/classObject/Test.java b/jdk/test/java/io/Serializable/enum/classObject/Test.java index e0f6ea2bd9..8d341c0447 100644 --- a/jdk/test/java/io/Serializable/enum/classObject/Test.java +++ b/jdk/test/java/io/Serializable/enum/classObject/Test.java @@ -25,9 +25,6 @@ * @bug 4838379 * @summary Verify that serialization of Class objects for enum types works * properly. - * - * @compile -source 1.5 Test.java - * @run main Test */ import java.io.*; diff --git a/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java b/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java index 18dcfb5685..349125cc9e 100644 --- a/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java +++ b/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java @@ -26,10 +26,10 @@ * @summary Verify that serialization of enum constants that are instances of * constant-specific subclasses functions properly. * - * @compile -source 1.5 Write.java + * @compile Write.java * @run main Write * @clean Write - * @compile -source 1.5 Read.java + * @compile Read.java * @run main Read * @clean Read */ diff --git a/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java b/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java index 2780a283e5..d5326af0d2 100644 --- a/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java +++ b/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java @@ -25,9 +25,6 @@ * @bug 4838379 * @summary Verify that serialVersionUID and serialPersistentFields * declarations made by enum types and constants are ignored. - * - * @compile -source 1.5 Test.java - * @run main Test */ import java.io.*; diff --git a/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java b/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java index 39bde6e255..a1f9bbc6c7 100644 --- a/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java +++ b/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java @@ -25,9 +25,6 @@ * @bug 4838379 * @summary Verify that custom serialization methods defined by enum types are * not invoked during serialization or deserialization. - * - * @compile -source 1.5 Test.java - * @run main Test */ import java.io.*; diff --git a/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java b/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java index f050cd964d..7197581700 100644 --- a/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java +++ b/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java @@ -26,9 +26,6 @@ * @summary Verify that TC_OBJECT followed by a class descriptor for an enum * class results in an InvalidClassException, as does TC_ENUM followed * by a class descriptor for a non-enum class. - * - * @compile -source 1.5 Test.java - * @run main Test */ import java.io.*; diff --git a/jdk/test/java/io/Serializable/enum/missingConstant/Write.java b/jdk/test/java/io/Serializable/enum/missingConstant/Write.java index 2939520636..fb66b4ce4d 100644 --- a/jdk/test/java/io/Serializable/enum/missingConstant/Write.java +++ b/jdk/test/java/io/Serializable/enum/missingConstant/Write.java @@ -26,10 +26,10 @@ * @summary Verify that deserialization of an enum constant that does not exist * on the receiving side results in an InvalidObjectException. * - * @compile -source 1.5 Write.java + * @compile Write.java * @run main Write * @clean Write - * @compile -source 1.5 Read.java + * @compile Read.java * @run main Read * @clean Read */ diff --git a/jdk/test/java/io/Serializable/enum/unshared/Test.java b/jdk/test/java/io/Serializable/enum/unshared/Test.java index c4bdde9bc0..036e6e8b8a 100644 --- a/jdk/test/java/io/Serializable/enum/unshared/Test.java +++ b/jdk/test/java/io/Serializable/enum/unshared/Test.java @@ -25,9 +25,6 @@ * @bug 4838379 * @summary Verify that unshared write and read operations work properly with * enum constants. - * - * @compile -source 1.5 Test.java - * @run main Test */ import java.io.*; diff --git a/jdk/test/java/lang/Boolean/MakeBooleanComparable.java b/jdk/test/java/lang/Boolean/MakeBooleanComparable.java index b84a4a27f5..21840de392 100644 --- a/jdk/test/java/lang/Boolean/MakeBooleanComparable.java +++ b/jdk/test/java/lang/Boolean/MakeBooleanComparable.java @@ -26,9 +26,6 @@ * @bug 4329937 * @summary Basic test for making Boolean implement Comparable * @author Josh Bloch - * - * @compile -source 1.5 MakeBooleanComparable.java - * @run main MakeBooleanComparable */ import java.util.*; diff --git a/jdk/test/java/lang/Class/Cast.java b/jdk/test/java/lang/Class/Cast.java index 0f57c221c4..ec413f044e 100644 --- a/jdk/test/java/lang/Class/Cast.java +++ b/jdk/test/java/lang/Class/Cast.java @@ -25,9 +25,6 @@ * @test * @bug 4881275 * @summary (reflect) Class.cast() - typesafe cast desired - * - * @compile -source 1.5 Cast.java - * @run main Cast */ public class Cast { diff --git a/jdk/test/java/lang/Class/IsEnum.java b/jdk/test/java/lang/Class/IsEnum.java index 1b4ccb7051..08d1e58d78 100644 --- a/jdk/test/java/lang/Class/IsEnum.java +++ b/jdk/test/java/lang/Class/IsEnum.java @@ -26,8 +26,6 @@ * @bug 4891872 4989735 4990789 5020490 * @summary Check isEnum() method * @author Joseph D. Darcy - * @compile -source 1.5 IsEnum.java - * @run main IsEnum */ import java.lang.annotation.*; diff --git a/jdk/test/java/lang/Class/asSubclass/BasicUnit.java b/jdk/test/java/lang/Class/asSubclass/BasicUnit.java index 68cf1c36bf..e9e8b68e85 100644 --- a/jdk/test/java/lang/Class/asSubclass/BasicUnit.java +++ b/jdk/test/java/lang/Class/asSubclass/BasicUnit.java @@ -27,7 +27,7 @@ * @summary please add a typesafe cast for Class types * @author gafter * - * @compile -Xlint:unchecked -Werror -source 1.5 BasicUnit.java + * @compile -Xlint:unchecked -Werror BasicUnit.java * @run main BasicUnit */ diff --git a/jdk/test/java/lang/ClassLoader/Assert.sh b/jdk/test/java/lang/ClassLoader/Assert.sh index 4744defce3..95dd51f146 100644 --- a/jdk/test/java/lang/ClassLoader/Assert.sh +++ b/jdk/test/java/lang/ClassLoader/Assert.sh @@ -47,7 +47,7 @@ cp ${TESTSRC}/Assert.java . cp -R ${TESTSRC}/package1 . cp -R ${TESTSRC}/package2 . -${TESTJAVA}/bin/javac -source 1.4 Assert.java +${TESTJAVA}/bin/javac Assert.java ${TESTJAVA}/bin/java Assert diff --git a/jdk/test/java/lang/Integer/BitTwiddle.java b/jdk/test/java/lang/Integer/BitTwiddle.java index 4904ea5aa3..35d61efd3a 100644 --- a/jdk/test/java/lang/Integer/BitTwiddle.java +++ b/jdk/test/java/lang/Integer/BitTwiddle.java @@ -26,9 +26,6 @@ * @bug 4495754 * @summary Basic test for int bit twiddling * @author Josh Bloch - * - * @compile -source 1.5 BitTwiddle.java - * @run main BitTwiddle */ import java.util.Random; diff --git a/jdk/test/java/lang/Long/BitTwiddle.java b/jdk/test/java/lang/Long/BitTwiddle.java index fb1affd41d..eefa9e8328 100644 --- a/jdk/test/java/lang/Long/BitTwiddle.java +++ b/jdk/test/java/lang/Long/BitTwiddle.java @@ -26,9 +26,6 @@ * @bug 4495754 * @summary Basic test for long bit twiddling * @author Josh Bloch - * - * @compile -source 1.5 BitTwiddle.java - * @run main BitTwiddle */ import java.util.Random; diff --git a/jdk/test/java/lang/Math/Atan2Tests.java b/jdk/test/java/lang/Math/Atan2Tests.java index 0660ff3744..ed81283b36 100644 --- a/jdk/test/java/lang/Math/Atan2Tests.java +++ b/jdk/test/java/lang/Math/Atan2Tests.java @@ -25,8 +25,6 @@ * @test * @bug 4984407 * @summary Tests for {Math, StrictMath}.atan2 - * @compile -source 1.5 Atan2Tests.java - * @run main Atan2Tests * @author Joseph D. Darcy */ diff --git a/jdk/test/java/lang/Math/IeeeRecommendedTests.java b/jdk/test/java/lang/Math/IeeeRecommendedTests.java index 4123451ed5..f35d76ef3b 100644 --- a/jdk/test/java/lang/Math/IeeeRecommendedTests.java +++ b/jdk/test/java/lang/Math/IeeeRecommendedTests.java @@ -26,8 +26,6 @@ * @bug 4860891 4826732 4780454 4939441 4826652 * @summary Tests for IEEE 754[R] recommended functions and similar methods * @author Joseph D. Darcy - * @compile -source 1.5 IeeeRecommendedTests.java - * @run main IeeeRecommendedTests */ import sun.misc.FpUtils; diff --git a/jdk/test/java/lang/Math/PowTests.java b/jdk/test/java/lang/Math/PowTests.java index 79764765e3..872de407d1 100644 --- a/jdk/test/java/lang/Math/PowTests.java +++ b/jdk/test/java/lang/Math/PowTests.java @@ -25,8 +25,6 @@ * @test * @bug 4984407 5033578 * @summary Tests for {Math, StrictMath}.pow - * @compile -source 1.5 PowTests.java - * @run main PowTests * @author Joseph D. Darcy */ diff --git a/jdk/test/java/lang/Math/TanTests.java b/jdk/test/java/lang/Math/TanTests.java index f603fb872a..75d44631cd 100644 --- a/jdk/test/java/lang/Math/TanTests.java +++ b/jdk/test/java/lang/Math/TanTests.java @@ -25,8 +25,6 @@ * @test * @bug 5033578 * @summary Tests for {Math, StrictMath}.tan - * @compile -source 1.5 TanTests.java - * @run main TanTests * @author Joseph D. Darcy */ diff --git a/jdk/test/java/lang/Runtime/exec/WinCommand.java b/jdk/test/java/lang/Runtime/exec/WinCommand.java index 37e17a1f31..b51489b76a 100644 --- a/jdk/test/java/lang/Runtime/exec/WinCommand.java +++ b/jdk/test/java/lang/Runtime/exec/WinCommand.java @@ -25,9 +25,6 @@ * @bug 5006520 * @summary Check many different ways to run Windows programs * @author Martin Buchholz - * - * @compile -source 1.5 WinCommand.java - * @run main WinCommand */ import java.io.*; diff --git a/jdk/test/java/lang/Thread/GenerifyStackTraces.java b/jdk/test/java/lang/Thread/GenerifyStackTraces.java index e10080c004..632228cf82 100644 --- a/jdk/test/java/lang/Thread/GenerifyStackTraces.java +++ b/jdk/test/java/lang/Thread/GenerifyStackTraces.java @@ -26,9 +26,6 @@ * @bug 4919105 * @summary Generified basic unit test of Thread.getAllStackTraces() * @author Mandy Chung - * - * @compile -source 1.5 GenerifyStackTraces.java - * @run main GenerifyStackTraces */ import java.util.*; diff --git a/jdk/test/java/lang/Thread/UncaughtExceptions.sh b/jdk/test/java/lang/Thread/UncaughtExceptions.sh index 43b56c8e6f..51aa0c5893 100644 --- a/jdk/test/java/lang/Thread/UncaughtExceptions.sh +++ b/jdk/test/java/lang/Thread/UncaughtExceptions.sh @@ -121,7 +121,7 @@ public class Seppuku extends Thread implements Runnable { } EOJAVA - Sys "$javac" "-source" "1.5" "Seppuku.java" + Sys "$javac" "Seppuku.java" CheckCommandResults "$expectedRC" "$expectedOut" "$expectedErr" \ "$java" "Seppuku" Cleanup diff --git a/jdk/test/java/lang/annotation/UnitTest.java b/jdk/test/java/lang/annotation/UnitTest.java index ed8b05c3cc..160ebe683a 100644 --- a/jdk/test/java/lang/annotation/UnitTest.java +++ b/jdk/test/java/lang/annotation/UnitTest.java @@ -26,8 +26,6 @@ * @bug 4906359 4963461 4965058 4965039 4986770 * @summary Unit test for annotation reading * @author Josh Bloch - * @compile -source 1.5 UnitTest.java - * @run main UnitTest */ import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/jdk/test/java/lang/annotation/package-info.java b/jdk/test/java/lang/annotation/package-info.java index 78afb3f6c0..d2bef02dde 100644 --- a/jdk/test/java/lang/annotation/package-info.java +++ b/jdk/test/java/lang/annotation/package-info.java @@ -27,7 +27,7 @@ * @summary Package annotations * @author gafter * - * @compile -source 1.5 package-info.java PackageMain.java + * @compile package-info.java PackageMain.java * @run main PackageMain */ diff --git a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java b/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java index d833e5eb9a..8002188024 100644 --- a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java +++ b/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java @@ -29,7 +29,7 @@ * the input CompositeData is invalid. * @author Mandy Chung * - * @compile -source 1.5 OpenTypeConverter.java + * @compile OpenTypeConverter.java * @build MemoryNotifInfoCompositeData * @run main MemoryNotifInfoCompositeData */ diff --git a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java index 6c3cb0d044..31be3a1596 100644 --- a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java +++ b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java @@ -29,7 +29,7 @@ * the input CompositeData is invalid. * @author Mandy Chung * - * @compile -source 1.5 OpenTypeConverter.java + * @compile OpenTypeConverter.java * @build ThreadInfoCompositeData * @run main ThreadInfoCompositeData */ diff --git a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java index afd6618e62..4a829fe76d 100644 --- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java +++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java @@ -26,9 +26,6 @@ * @bug 5024531 * @summary Basic Test for ManagementFactory.newPlatformMXBean(). * @author Mandy Chung - * - * @compile -source 1.5 MXBeanProxyTest.java - * @run main MXBeanProxyTest */ import javax.management.*; import java.lang.management.ClassLoadingMXBean; diff --git a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java index 7deb892569..939ac86a76 100644 --- a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java +++ b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java @@ -26,9 +26,6 @@ * @bug 4947536 * @summary Basic unit test of ManagementFactory.getPlatformMBeanServer() * @author Mandy Chung - * - * @compile -source 1.5 PlatformMBeanServerTest.java - * @run main PlatformMBeanServerTest */ import java.lang.management.*; diff --git a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java index 5be2510682..1feba9e13f 100644 --- a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java +++ b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java @@ -27,9 +27,6 @@ * @summary Test type mapping of the platform MXBean proxy * returned from Management.newPlatformMXBeanProxy(). * @author Mandy Chung - * - * @compile -source 1.5 ProxyExceptions.java - * @run main ProxyExceptions */ import java.lang.management.*; import javax.management.*; diff --git a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java index eb48825736..a4111b2e6e 100644 --- a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java +++ b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java @@ -28,7 +28,7 @@ * returned from Management.newPlatformMXBeanProxy(). * @author Mandy Chung * - * @compile -source 1.5 ProxyTypeMapping.java + * @compile ProxyTypeMapping.java * @run main/othervm -verbose:gc ProxyTypeMapping */ import java.lang.management.*; diff --git a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java index 68d5304b91..d4fd4ea4a9 100644 --- a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java +++ b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java @@ -28,7 +28,7 @@ * MBeanServer. * @author Mandy Chung * - * @compile -source 1.5 ValidateOpenTypes.java + * @compile ValidateOpenTypes.java * @run main/othervm -verbose:gc ValidateOpenTypes */ import java.lang.management.*; diff --git a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java index 5a65537846..c411192f08 100644 --- a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java +++ b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java @@ -26,9 +26,6 @@ * @bug 4990512 * @summary Basic Test for RuntimeMXBean.getSystemProperties(). * @author Mandy Chung - * - * @compile -source 1.5 GetSystemProperties.java - * @run main GetSystemProperties */ import java.lang.management.ManagementFactory; diff --git a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh index f1fb705f37..e38817ec3f 100644 --- a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh +++ b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh @@ -27,7 +27,7 @@ # @summary # @author Mandy Chung # -# @run compile -source 1.5 InputArgument.java +# @run compile InputArgument.java # @run shell TestInputArgument.sh # diff --git a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java b/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java index 49709884f5..59ed2dbfa9 100644 --- a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java +++ b/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java @@ -26,8 +26,6 @@ * @bug 5033583 6316717 6470106 * @summary Check toGenericString() and toString() methods * @author Joseph D. Darcy - * @compile -source 1.5 GenericStringTest.java - * @run main GenericStringTest */ import java.lang.reflect.*; diff --git a/jdk/test/java/lang/reflect/Field/GenericStringTest.java b/jdk/test/java/lang/reflect/Field/GenericStringTest.java index f25a6ca36f..148e69a706 100644 --- a/jdk/test/java/lang/reflect/Field/GenericStringTest.java +++ b/jdk/test/java/lang/reflect/Field/GenericStringTest.java @@ -26,8 +26,6 @@ * @bug 5033583 * @summary Check toGenericString() method * @author Joseph D. Darcy - * @compile -source 1.5 GenericStringTest.java - * @run main GenericStringTest */ import java.lang.reflect.*; diff --git a/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java b/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java index d49a5ea628..dac18fb7cb 100644 --- a/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java +++ b/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java @@ -26,8 +26,6 @@ * @bug 5015676 4987888 4997464 * @summary Testing upper bounds and availability of toString methods * @author Joseph D. Darcy - * @compile -source 1.5 StringsAndBounds.java - * @run main StringsAndBounds */ import java.lang.reflect.*; diff --git a/jdk/test/java/lang/reflect/Generics/TestC1.java b/jdk/test/java/lang/reflect/Generics/TestC1.java index 756a4c63ec..8a9fbe3703 100644 --- a/jdk/test/java/lang/reflect/Generics/TestC1.java +++ b/jdk/test/java/lang/reflect/Generics/TestC1.java @@ -26,7 +26,7 @@ * @bug 4891872 * @summary Some tests for the generic core reflection api. * @author Gilad Bracha -* @compile -source 1.5 TestC1.java +* @compile TestC1.java * @run main/othervm -ea TestC1 */ diff --git a/jdk/test/java/lang/reflect/Generics/TestC2.java b/jdk/test/java/lang/reflect/Generics/TestC2.java index d42671b3d3..c2e574a2fa 100644 --- a/jdk/test/java/lang/reflect/Generics/TestC2.java +++ b/jdk/test/java/lang/reflect/Generics/TestC2.java @@ -26,7 +26,7 @@ * @bug 4891872 * @summary Some tests for the generic core reflection api. * @author Gilad Bracha -* @compile -source 1.5 TestC2.java +* @compile TestC2.java * @run main/othervm -ea TestC2 */ diff --git a/jdk/test/java/lang/reflect/Generics/TestN1.java b/jdk/test/java/lang/reflect/Generics/TestN1.java index d2dc8b253f..014a09f956 100644 --- a/jdk/test/java/lang/reflect/Generics/TestN1.java +++ b/jdk/test/java/lang/reflect/Generics/TestN1.java @@ -26,7 +26,7 @@ * @bug 4891872 * @summary Some tests for the generic core reflection api. * @author Gilad Bracha -* @compile -source 1.5 TestN1.java +* @compile TestN1.java * @run main/othervm -ea TestN1 */ diff --git a/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java b/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java index 1427563f85..77a71013fb 100644 --- a/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java +++ b/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java @@ -26,8 +26,6 @@ * @bug 4981727 * @summary * @author Joseph D. Darcy - * @compile -source 1.5 exceptionCauseTest.java - * @run main exceptionCauseTest */ import java.io.PrintStream; diff --git a/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java b/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java index d7f5d6de7d..f7a60f26d6 100644 --- a/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java +++ b/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java @@ -26,8 +26,6 @@ * @bug 4979440 * @summary Test for signature parsing corner case * @author Joseph D. Darcy - * @compile -source 1.5 getAnnotationTest.java - * @run main getAnnotationTest */ import java.lang.reflect.*; diff --git a/jdk/test/java/lang/reflect/Method/Equals.java b/jdk/test/java/lang/reflect/Method/Equals.java index 2bcb4ecf4e..7f7bd70f32 100644 --- a/jdk/test/java/lang/reflect/Method/Equals.java +++ b/jdk/test/java/lang/reflect/Method/Equals.java @@ -27,7 +27,7 @@ * @summary Generic framework to test Method.equals. * * @clean A - * @compile -source 1.5 Equals.java + * @compile Equals.java * @run main Equals */ diff --git a/jdk/test/java/lang/reflect/Method/GenericStringTest.java b/jdk/test/java/lang/reflect/Method/GenericStringTest.java index 361e3db8c7..3894252a52 100644 --- a/jdk/test/java/lang/reflect/Method/GenericStringTest.java +++ b/jdk/test/java/lang/reflect/Method/GenericStringTest.java @@ -26,8 +26,6 @@ * @bug 5033583 6316717 6470106 * @summary Check toGenericString() and toString() methods * @author Joseph D. Darcy - * @compile -source 1.5 GenericStringTest.java - * @run main GenericStringTest */ import java.lang.reflect.*; diff --git a/jdk/test/java/math/BigDecimal/DivideTests.java b/jdk/test/java/math/BigDecimal/DivideTests.java index 7d04a60ca4..5265f6d32f 100644 --- a/jdk/test/java/math/BigDecimal/DivideTests.java +++ b/jdk/test/java/math/BigDecimal/DivideTests.java @@ -26,8 +26,6 @@ * @bug 4851776 4907265 6177836 6876282 * @summary Some tests for the divide methods. * @author Joseph D. Darcy - * @compile -source 1.5 DivideTests.java - * @run main DivideTests */ import java.math.*; diff --git a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java b/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java index 100eca40cc..6ce5a90045 100644 --- a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java +++ b/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java @@ -25,8 +25,6 @@ * @bug 4904082 4917089 6337226 * @summary Tests that integral division and related methods return the proper result and scale. * @author Joseph D. Darcy - * @compile -source 1.5 IntegralDivisionTests.java - * @run main IntegralDivisionTests */ import java.math.*; public class IntegralDivisionTests { diff --git a/jdk/test/java/math/BigDecimal/PowTests.java b/jdk/test/java/math/BigDecimal/PowTests.java index 9623b70bc1..78b3b6a570 100644 --- a/jdk/test/java/math/BigDecimal/PowTests.java +++ b/jdk/test/java/math/BigDecimal/PowTests.java @@ -26,8 +26,6 @@ * @bug 4916097 * @summary Some exponent over/undeflow tests for the pow method * @author Joseph D. Darcy - * @compile -source 1.5 PowTests.java - * @run main PowTests */ import java.math.*; diff --git a/jdk/test/java/math/BigDecimal/ToPlainStringTests.java b/jdk/test/java/math/BigDecimal/ToPlainStringTests.java index aca745b7e4..9343b0dbab 100644 --- a/jdk/test/java/math/BigDecimal/ToPlainStringTests.java +++ b/jdk/test/java/math/BigDecimal/ToPlainStringTests.java @@ -26,8 +26,6 @@ * @bug 4984872 * @summary Basic tests of toPlainString method * @author Joseph D. Darcy - * @compile -source 1.5 ToPlainStringTests.java - * @run main ToPlainStringTests */ import java.math.*; diff --git a/jdk/test/java/math/BigDecimal/ZeroScalingTests.java b/jdk/test/java/math/BigDecimal/ZeroScalingTests.java index a48e005a4b..abd5451e06 100644 --- a/jdk/test/java/math/BigDecimal/ZeroScalingTests.java +++ b/jdk/test/java/math/BigDecimal/ZeroScalingTests.java @@ -26,8 +26,6 @@ * @bug 4902952 4905407 4916149 * @summary Tests that the scale of zero is propagated properly and has the proper effect. * @author Joseph D. Darcy - * @compile -source 1.5 ZeroScalingTests.java - * @run main ZeroScalingTests */ import java.math.*; diff --git a/jdk/test/java/math/RoundingMode/RoundingModeTests.java b/jdk/test/java/math/RoundingMode/RoundingModeTests.java index 03fd5e7ac8..8a7cd1aa0c 100644 --- a/jdk/test/java/math/RoundingMode/RoundingModeTests.java +++ b/jdk/test/java/math/RoundingMode/RoundingModeTests.java @@ -26,8 +26,6 @@ * @bug 4851776 4891522 4905335 * @summary Basic tests for the RoundingMode class. * @author Joseph D. Darcy - * @compile -source 1.5 RoundingModeTests.java - * @run main RoundingModeTests */ import java.math.RoundingMode; diff --git a/jdk/test/java/net/ProxySelector/ProxyTest.java b/jdk/test/java/net/ProxySelector/ProxyTest.java index 869eb3fab2..18be010f61 100644 --- a/jdk/test/java/net/ProxySelector/ProxyTest.java +++ b/jdk/test/java/net/ProxySelector/ProxyTest.java @@ -27,7 +27,7 @@ * @summary HTTP client: Improve proxy server configuration and selection * @library ../../../sun/net/www/httptest/ * @build ClosedChannelList HttpServer HttpTransaction HttpCallback - * @compile -source 1.5 ProxyTest.java + * @compile ProxyTest.java * @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 ProxyTest */ diff --git a/jdk/test/java/net/URL/PerConnectionProxy.java b/jdk/test/java/net/URL/PerConnectionProxy.java index 0640ec4bb8..9a8cdf2616 100644 --- a/jdk/test/java/net/URL/PerConnectionProxy.java +++ b/jdk/test/java/net/URL/PerConnectionProxy.java @@ -26,7 +26,7 @@ * @summary Needs per connection proxy support for URLs * @library ../../../sun/net/www/httptest/ * @build ClosedChannelList HttpServer HttpTransaction HttpCallback - * @compile -source 1.5 PerConnectionProxy.java + * @compile PerConnectionProxy.java * @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 PerConnectionProxy */ diff --git a/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java b/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java index 14b8b0698e..b9f172fb2f 100644 --- a/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java +++ b/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java @@ -24,7 +24,7 @@ /** * @test * @test 4422738 - * @compile -source 1.4 -target 1.4 InvalidParameters.java + * @compile -source 1.4 InvalidParameters.java * @run main InvalidParameters * @summary Make sure PKIXBuilderParameters(Set) detects invalid * parameters and throws correct exceptions diff --git a/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java b/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java index d3e3c5ab78..01946d6e2e 100644 --- a/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java +++ b/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java @@ -24,7 +24,7 @@ /** * @test * @test 4422738 - * @compile -source 1.4 -target 1.4 InvalidParameters.java + * @compile -source 1.4 InvalidParameters.java * @run main InvalidParameters * @summary Make sure PKIXParameters(Set) and setTrustAnchors() detects invalid * parameters and throws correct exceptions diff --git a/jdk/test/java/util/AbstractList/CheckForComodification.java b/jdk/test/java/util/AbstractList/CheckForComodification.java index 156c789827..790a4bb6c4 100644 --- a/jdk/test/java/util/AbstractList/CheckForComodification.java +++ b/jdk/test/java/util/AbstractList/CheckForComodification.java @@ -28,8 +28,6 @@ * @author Josh Bloch * * @ignore Bug fix temporarily removed as it uncovered other bugs (4992226) - * @compile -source 1.5 CheckForComodification.java - * @run main CheckForComodification */ import java.util.*; diff --git a/jdk/test/java/util/Collections/AddAll.java b/jdk/test/java/util/Collections/AddAll.java index ef66b00759..48bbc799a5 100644 --- a/jdk/test/java/util/Collections/AddAll.java +++ b/jdk/test/java/util/Collections/AddAll.java @@ -26,9 +26,6 @@ * @bug 4822887 * @summary Basic test for Collections.addAll * @author Josh Bloch - * - * @compile -source 1.5 AddAll.java - * @run main AddAll */ import java.util.*; diff --git a/jdk/test/java/util/Collections/Disjoint.java b/jdk/test/java/util/Collections/Disjoint.java index 8d820f1001..ada965efa6 100644 --- a/jdk/test/java/util/Collections/Disjoint.java +++ b/jdk/test/java/util/Collections/Disjoint.java @@ -26,9 +26,6 @@ * @bug 4339792 * @summary Basic test for Collections.disjoint * @author Josh Bloch - * - * @compile -source 1.5 Disjoint.java - * @run main Disjoint */ import java.util.*; diff --git a/jdk/test/java/util/Collections/Frequency.java b/jdk/test/java/util/Collections/Frequency.java index a21265720f..71938c561c 100644 --- a/jdk/test/java/util/Collections/Frequency.java +++ b/jdk/test/java/util/Collections/Frequency.java @@ -26,9 +26,6 @@ * @bug 4193200 * @summary Basic test for Collections.frequency * @author Josh Bloch - * - * @compile -source 1.5 Frequency.java - * @run main Frequency */ import java.util.*; diff --git a/jdk/test/java/util/EnumMap/EnumMapBash.java b/jdk/test/java/util/EnumMap/EnumMapBash.java index 4dd51b1332..1182bf6c44 100644 --- a/jdk/test/java/util/EnumMap/EnumMapBash.java +++ b/jdk/test/java/util/EnumMap/EnumMapBash.java @@ -27,9 +27,6 @@ * @summary Unit test for EnumMap * @author Josh Bloch * @author Yo Yo Ma - * - * @compile -source 1.5 EnumMapBash.java - * @run main EnumMapBash */ import java.util.*; diff --git a/jdk/test/java/util/EnumSet/AllOf.java b/jdk/test/java/util/EnumSet/AllOf.java index 712fbc3771..28e471b0bf 100644 --- a/jdk/test/java/util/EnumSet/AllOf.java +++ b/jdk/test/java/util/EnumSet/AllOf.java @@ -26,9 +26,6 @@ * @bug 4946090 * @summary AllOf static factory is broken in Regular and Jumbo enum set * @author Josh Bloch - * - * @compile -source 1.5 AllOf.java - * @run main AllOf */ import java.util.*; diff --git a/jdk/test/java/util/EnumSet/ComplementOf.java b/jdk/test/java/util/EnumSet/ComplementOf.java index 35251792ee..3a9fe377a4 100644 --- a/jdk/test/java/util/EnumSet/ComplementOf.java +++ b/jdk/test/java/util/EnumSet/ComplementOf.java @@ -26,9 +26,6 @@ * @bug 4946096 * @summary ComplementOf static factory is broken in Regular and Jumbo enum set * @author Josh Bloch - * - * @compile -source 1.5 ComplementOf.java - * @run main ComplementOf */ import java.util.*; diff --git a/jdk/test/java/util/EnumSet/EnumSetBash.java b/jdk/test/java/util/EnumSet/EnumSetBash.java index fd61f11975..51dd8cbfef 100644 --- a/jdk/test/java/util/EnumSet/EnumSetBash.java +++ b/jdk/test/java/util/EnumSet/EnumSetBash.java @@ -28,9 +28,6 @@ * @author Josh Bloch * @author Neal Gafter * @author Yo Ma Ma - * - * @compile -source 1.5 EnumSetBash.java - * @run main EnumSetBash */ import java.util.*; diff --git a/jdk/test/java/util/EnumSet/JumboRange.java b/jdk/test/java/util/EnumSet/JumboRange.java index eec9565723..55be9784dc 100644 --- a/jdk/test/java/util/EnumSet/JumboRange.java +++ b/jdk/test/java/util/EnumSet/JumboRange.java @@ -26,9 +26,6 @@ * @bug 4958003 * @summary Range static factory fails to compute size in Jumbo enum set * @author Josh Bloch - * - * @compile -source 1.5 JumboRange.java - * @run main JumboRange */ import java.util.*; diff --git a/jdk/test/java/util/EnumSet/Range.java b/jdk/test/java/util/EnumSet/Range.java index 2a0301b68b..ad4ab959c3 100644 --- a/jdk/test/java/util/EnumSet/Range.java +++ b/jdk/test/java/util/EnumSet/Range.java @@ -26,9 +26,6 @@ * @bug 4952736 * @summary Range static factory is broken in Regular and Jumbo enum set * @author Josh Bloch - * - * @compile -source 1.5 Range.java - * @run main Range */ import java.util.*; diff --git a/jdk/test/java/util/Formattable/StockName.java b/jdk/test/java/util/Formattable/StockName.java index 30a06da821..d4b092e802 100644 --- a/jdk/test/java/util/Formattable/StockName.java +++ b/jdk/test/java/util/Formattable/StockName.java @@ -21,11 +21,9 @@ * have any questions. */ -/** +/* * @test * @bug 4965770 4992540 5030716 - * @compile -source 1.5 StockName.java - * @run main StockName */ import java.nio.CharBuffer; diff --git a/jdk/test/java/util/IdentityHashMap/ToString.java b/jdk/test/java/util/IdentityHashMap/ToString.java index 794ccb9982..8b22e3013f 100644 --- a/jdk/test/java/util/IdentityHashMap/ToString.java +++ b/jdk/test/java/util/IdentityHashMap/ToString.java @@ -26,9 +26,6 @@ * @bug 4973432 * @summary Test that toString on entrySet Iterator/Entry behaves reasonably * @author Josh Bloch - * - * @compile -source 1.5 ToString.java - * @run main ToString */ diff --git a/jdk/test/java/util/Locale/Bug4175998Test.java b/jdk/test/java/util/Locale/Bug4175998Test.java index 96335255d0..37ebee4860 100644 --- a/jdk/test/java/util/Locale/Bug4175998Test.java +++ b/jdk/test/java/util/Locale/Bug4175998Test.java @@ -23,7 +23,7 @@ /* @test @summary test ISO639-2 language codes - @compile -encoding ascii -source 1.4 -target 1.4 Bug4175998Test.java + @compile -encoding ascii -source 5 Bug4175998Test.java @run main Bug4175998Test @bug 4175998 */ diff --git a/jdk/test/java/util/UUID/UUIDTest.java b/jdk/test/java/util/UUID/UUIDTest.java index c71f6a4106..2dde63c655 100644 --- a/jdk/test/java/util/UUID/UUIDTest.java +++ b/jdk/test/java/util/UUID/UUIDTest.java @@ -23,8 +23,6 @@ /* @test * @bug 4173528 5068772 - * @compile -source 1.4 -target 1.4 UUIDTest.java - * @run main UUIDTest * @summary Unit tests for java.util.UUID */ diff --git a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java index 98ac5d744e..b704bb12c3 100644 --- a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java +++ b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 CancelledProducerConsumerLoops.java + * @compile CancelledProducerConsumerLoops.java * @run main/timeout=7000 CancelledProducerConsumerLoops * @summary Checks for responsiveness of blocking queues to cancellation. * Runs under the assumption that ITERS computations require more than diff --git a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java index 8b7db5a945..31db3a1dde 100644 --- a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java +++ b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 MultipleProducersSingleConsumerLoops.java + * @compile MultipleProducersSingleConsumerLoops.java * @run main/timeout=3600 MultipleProducersSingleConsumerLoops * @summary multiple producers and single consumer using blocking queues */ diff --git a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java index 761990d3a9..c6ca42e9ff 100644 --- a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java +++ b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 ProducerConsumerLoops.java + * @compile ProducerConsumerLoops.java * @run main/timeout=3600 ProducerConsumerLoops * @summary multiple producers and consumers using blocking queues */ diff --git a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java index c99a664b78..f365dea71a 100644 --- a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java +++ b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 SingleProducerMultipleConsumerLoops.java + * @compile SingleProducerMultipleConsumerLoops.java * @run main/timeout=600 SingleProducerMultipleConsumerLoops * @summary check ordering for blocking queues with 1 producer and multiple consumers */ diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java index 1c77f5bb16..9a47619436 100644 --- a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java +++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 MapCheck.java + * @compile MapCheck.java * @run main/timeout=240 MapCheck * @summary Times and checks basic map operations */ diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java index e6c310ff15..f7aeab10f8 100644 --- a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java +++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 MapLoops.java + * @compile MapLoops.java * @run main/timeout=1600 MapLoops * @summary Exercise multithreaded maps, by default ConcurrentHashMap. * Multithreaded hash table test. Each thread does a random walk diff --git a/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java b/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java index 53f987381c..43763426a0 100644 --- a/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java +++ b/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 ExchangeLoops.java + * @compile ExchangeLoops.java * @run main/timeout=720 ExchangeLoops * @summary checks to make sure a pipeline of exchangers passes data. */ diff --git a/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java b/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java index fe713fe079..35e183395a 100644 --- a/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java +++ b/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4965960 - * @compile -source 1.5 ExecutorCompletionServiceLoops.java + * @compile ExecutorCompletionServiceLoops.java * @run main/timeout=3600 ExecutorCompletionServiceLoops * @summary Exercise ExecutorCompletionServiceLoops */ diff --git a/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java b/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java index a3d1536d11..c05dd0bcda 100644 --- a/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java +++ b/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 CancelledFutureLoops.java + * @compile CancelledFutureLoops.java * @run main/timeout=2000 CancelledFutureLoops * @summary Checks for responsiveness of futures to cancellation. * Runs under the assumption that ITERS computations require more than diff --git a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java b/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java index 42a7587dbe..055d0259dc 100644 --- a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java +++ b/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java @@ -24,8 +24,6 @@ /* * @test * @bug 4992443 4994819 - * @compile -source 1.5 VMSupportsCS8.java - * @run main VMSupportsCS8 * @summary Checks that the value of VMSupportsCS8 matches system properties. */ diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java index fb1c7b5b5c..fc98478117 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 CancelledLockLoops.java + * @compile CancelledLockLoops.java * @run main/timeout=2800 CancelledLockLoops * @summary tests lockInterruptibly. * Checks for responsiveness of locks to interrupts. Runs under that diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java index 444c55e82f..361ea1a372 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 LockOncePerThreadLoops.java + * @compile LockOncePerThreadLoops.java * @run main/timeout=15000 LockOncePerThreadLoops * @summary Checks for missed signals by locking and unlocking each of an array of locks once per thread */ diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java index ead5c960f1..37641686ef 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 SimpleReentrantLockLoops.java + * @compile SimpleReentrantLockLoops.java * @run main/timeout=4500 SimpleReentrantLockLoops * @summary multiple threads using a single lock */ diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java index d1edcc911d..d0df653fb8 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java @@ -34,8 +34,6 @@ /* * @test * @bug 4486658 5031862 - * @compile -source 1.5 TimeoutLockLoops.java - * @run main TimeoutLockLoops * @summary Checks for responsiveness of locks to timeouts. * Runs under the assumption that ITERS computations require more than * TIMEOUT msecs to complete, which seems to be a safe assumption for diff --git a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java index a6e710b0b2..6596ed5a7d 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4486658 - * @compile -source 1.5 MapLoops.java + * @compile MapLoops.java * @run main/timeout=4700 MapLoops * @summary Exercise multithreaded maps, by default ConcurrentHashMap. * Multithreaded hash table test. Each thread does a random walk diff --git a/jdk/test/sun/management/AgentCheckTest.java b/jdk/test/sun/management/AgentCheckTest.java index 8d3f17edd9..d480f5b022 100644 --- a/jdk/test/sun/management/AgentCheckTest.java +++ b/jdk/test/sun/management/AgentCheckTest.java @@ -27,9 +27,6 @@ * @summary Localize log messages from the management agents * * @author Tim Bell - * - * @run compile -source 1.5 -g AgentCheckTest.java - * @run main AgentCheckTest */ import sun.management.Agent; diff --git a/jdk/test/sun/security/util/Oid/S11N.sh b/jdk/test/sun/security/util/Oid/S11N.sh index 77341e8a91..081cd52298 100644 --- a/jdk/test/sun/security/util/Oid/S11N.sh +++ b/jdk/test/sun/security/util/Oid/S11N.sh @@ -99,7 +99,7 @@ esac # the test code -${TESTJAVA}${FS}bin${FS}javac -source 1.3 -target 1.3 -d . ${TESTSRC}${FS}SerialTest.java || exit 10 +${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}SerialTest.java || exit 10 OLDJAVA=" /java/re/j2se/1.6.0/latest/binaries/${PF} diff --git a/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh b/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh index d2a34bb2a8..a5d211d514 100644 --- a/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh +++ b/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh @@ -98,7 +98,7 @@ env set -vx # #Compile. jconsole.jar is required on the classpath. -${TESTJAVA}/bin/javac -source 1.5 -d "${TESTCLASSES}" ${CP} -g \ +${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \ "${TESTSRC}"/"${TARGETCLASS}".java # #Run the test class, again with the classpath we need: -- GitLab