archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 20:14:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Abhijit Saha 2009-12-04 10:23:07 -08:00
commit 8b3295f470
118 changed files with 116 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jdk/make/java/java/Makefile
View file

@ -390,7 +390,7 @@ clean::
LOCALES_GEN_SH = localelist.sh
$(GENSRCDIR)/sun/util/CoreResourceBundleControl.java: \
$(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java $(LOCALES_GEN_SH)
$(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java.template $(LOCALES_GEN_SH)
@$(prep-target)
NAWK="$(NAWK)" SED="$(SED)" $(SH) $(LOCALES_GEN_SH) "$(JRE_NONEXIST_LOCALES)" \
$< $@

2
jdk/make/java/java/genlocales.gmk
View file

@ -68,7 +68,7 @@ NonEuro_Resources_properties := $(FILES_compiled_properties)
FILES_java := $(FILES_java_orig)
FILES_compiled_properties := $(FILES_compiled_properties_orig)
LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java
LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
LocaleDataMetaInfo_Dest=$(GENSRCDIR)/sun/util/LocaleDataMetaInfo.java
LOCALEGEN_SH=localegen.sh
RESOURCE_NAMES="FormatData CollationData TimeZoneNames LocaleNames CurrencyNames CalendarData"

2
jdk/make/java/java/localegen.sh
View file

@ -27,7 +27,7 @@
#
# This script is to generate the supported locale list string and replace the
# LocaleDataMetaInfo-XLocales.java in <ws>/src/share/classes/sun/util
# LocaleDataMetaInfo-XLocales.java.template in <ws>/src/share/classes/sun/util
#
# SORT, NAWK & SED is passed in as environment variables.
#

2
jdk/make/java/nio/Makefile
View file

@ -834,7 +834,7 @@ $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
GENCSSRC = $(BUILDDIR)/tools/CharsetMapping
CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar
$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java $(GENCSSRC)/sbcs
$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs
@$(prep-target)
$(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSSRC) $(SCS_GEN) sbcs

2
jdk/make/netbeans/README
View file

@ -411,7 +411,7 @@ Creating your own NetBeans project
java/util/regex/,\
java/util/spi/,\
java/util/zip/,\
**/*-XLocales.java
**/*-XLocales.java.template
jtreg.tests=\
java/util/**/*Collection/ \
java/util/**/*Map/ \

4
jdk/make/sun/nio/Makefile
View file

@ -82,7 +82,9 @@ $(FILES_DAT): $(FILES_MAP)
$(FILES_MAP) $(FILES_DAT) sjis0213
$(FILES_genout_extcs): $(GENCSDATASRC)/SingleByte-X.java $(GENCSDATASRC)/DoubleByte-X.java \
$(FILES_genout_extcs): \
$(GENCSDATASRC)/SingleByte-X.java.template \
$(GENCSDATASRC)/DoubleByte-X.java.template \
$(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs
@$(prep-target)
$(RM) -r $(GENCSEXT)

0
jdk/make/tools/CharsetMapping/DoubleByte-X.java → jdk/make/tools/CharsetMapping/DoubleByte-X.java.template
View file

0
jdk/make/tools/CharsetMapping/SingleByte-X.java → jdk/make/tools/CharsetMapping/SingleByte-X.java.template
View file

2
jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
View file

@ -63,7 +63,7 @@ public class GenerateDBCS {
int b2Min = toInteger(fields[8]);
int b2Max = toInteger(fields[9]);
System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
genClass(args[0], args[1], "DoubleByte-X.java",
genClass(args[0], args[1], "DoubleByte-X.java.template",
clzName, csName, hisName, pkgName,
isASCII, type,
b1Min, b1Max, b2Min, b2Max);

2
jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
View file

@ -55,7 +55,7 @@ public class GenerateSBCS {
String pkgName = fields[4];
System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
genClass(args[0], args[1], "SingleByte-X.java",
genClass(args[0], args[1], "SingleByte-X.java.template",
clzName, csName, hisName, pkgName, isASCII);
}
}

0
jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java → jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
View file

0
jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java → jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
View file

27
jdk/test/Makefile
View file

@ -282,11 +282,23 @@ STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/$(STATS_TXT_NAME)
RUNLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/runlist.txt
PASSLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/passlist.txt
FAILLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/faillist.txt
EXITCODE = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/exitcode.txt
TESTEXIT = \
if [ ! -s $(EXITCODE) ] ; then \
$(ECHO) "ERROR: EXITCODE file not filled in."; \
$(ECHO) "1" > $(EXITCODE); \
fi ; \
testExitCode=`$(CAT) $(EXITCODE)`; \
$(ECHO) "EXIT CODE: $${testExitCode}"; \
exit ${testExitCode}
BUNDLE_UP_AND_EXIT = \
( \
exitCode=$$? && \
jtregExitCode=$$? && \
_summary="$(SUMMARY_TXT)"; \
$(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST); \
$(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST) $(EXITCODE); \
$(ECHO) "$${jtregExitCode}" > $(EXITCODE); \
if [ -r "$${_summary}" ] ; then \
$(ECHO) "Summary: $${_summary}" > $(STATS_TXT); \
$(EXPAND) $${_summary} | $(EGREP) -v ' Not run\.' > $(RUNLIST); \
@ -297,10 +309,13 @@ BUNDLE_UP_AND_EXIT = \
$(EGREP) ' Error\.' $(RUNLIST); \
$(EGREP) -v ' Passed\.' $(RUNLIST) ) \
| $(SORT) | $(UNIQ) > $(FAILLIST); \
if [ $${exitCode} != 0 -o -s $(FAILLIST) ] ; then \
if [ $${jtregExitCode} != 0 -o -s $(FAILLIST) ] ; then \
$(EXPAND) $(FAILLIST) \
| $(CUT) -d' ' -f1 \
| $(SED) -e 's@^@FAILED: @' >> $(STATS_TXT); \
if [ $${jtregExitCode} = 0 ] ; then \
jtregExitCode=1; \
fi; \
fi; \
runc="`$(CAT) $(RUNLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \
passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \
@ -312,8 +327,8 @@ BUNDLE_UP_AND_EXIT = \
$(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \
fi; \
$(CAT) $(STATS_TXT); \
$(ZIP_UP_RESULTS) && $(KILL_DISPLAY) && \
exit $${exitCode} \
$(ZIP_UP_RESULTS) && $(KILL_DISPLAY) ; \
$(TESTEXIT) \
)
################################################################
@ -598,7 +613,7 @@ jtreg_tests: prep $(PRODUCT_HOME) $(JTREG) $(EXCLUDELIST)
$(JTREG_TEST_OPTIONS) \
$(TESTDIRS) \
) ; $(BUNDLE_UP_AND_EXIT) \
) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt
) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt ; $(TESTEXIT)
PHONY_LIST += jtreg_tests

8
jdk/test/ProblemList.txt
View file

@ -1099,6 +1099,14 @@ sun/tools/jps/jps-lm.sh generic-all
sun/tools/jps/jps-Vvml_2.sh generic-all
sun/tools/jps/jps-m_2.sh generic-all
# Fails on OpenSolaris "Could not synchronize with target"
sun/tools/jps/jps-Defaults.sh generic-all
sun/tools/jps/jps-V_2.sh generic-all
sun/tools/jps/jps-Vm_2.sh generic-all
sun/tools/jps/jps-Vvm.sh generic-all
sun/tools/jps/jps-Vvml.sh generic-all
sun/tools/jps/jps-m.sh generic-all
# Server name error, port 2098 problem?
sun/tools/jstatd/jstatdServerName.sh generic-all

5
jdk/test/com/sun/jdi/BadHandshakeTest.java
View file

@ -110,9 +110,10 @@ public class BadHandshakeTest {
String exe = System.getProperty("java.home")
+ File.separator + "bin" + File.separator;
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
String osname = System.getProperty("os.name");
if (osname.equals("SunOS") && arch.equals("sparcv9")) {
exe += "sparcv9/java";
} else if (arch.equals("amd64")) {
} else if (osname.equals("SunOS") && arch.equals("amd64")) {
exe += "amd64/java";
} else {
exe += "java";

5
jdk/test/com/sun/jdi/DoubleAgentTest.java
View file

@ -92,9 +92,10 @@ public class DoubleAgentTest {
String exe = System.getProperty("java.home")
+ File.separator + "bin" + File.separator;
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
String osname = System.getProperty("os.name");
if (osname.equals("SunOS") && arch.equals("sparcv9")) {
exe += "sparcv9/java";
} else if (arch.equals("amd64")) {
} else if (osname.equals("SunOS") && arch.equals("amd64")) {
exe += "amd64/java";
} else {
exe += "java";

5
jdk/test/com/sun/jdi/ExclusiveBind.java
View file

@ -99,9 +99,10 @@ public class ExclusiveBind {
String exe = System.getProperty("java.home") + File.separator + "bin" +
File.separator;
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
String osname = System.getProperty("os.name");
if (osname.equals("SunOS") && arch.equals("sparcv9")) {
exe += "sparcv9/java";
} else if (arch.equals("amd64")) {
} else if (osname.equals("SunOS") && arch.equals("amd64")) {
exe += "amd64/java";
} else {
exe += "java";

5
jdk/test/com/sun/jdi/RunToExit.java
View file

@ -115,9 +115,10 @@ public class RunToExit {
String exe = System.getProperty("java.home")
+ File.separator + "bin" + File.separator;
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
String osname = System.getProperty("os.name");
if (osname.equals("SunOS") && arch.equals("sparcv9")) {
exe += "sparcv9/java";
} else if (arch.equals("amd64")) {
} else if (osname.equals("SunOS") && arch.equals("amd64")) {
exe += "amd64/java";
} else {
exe += "java";

5
jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java
View file

@ -145,9 +145,10 @@ public class SimpleLaunchingConnector implements LaunchingConnector {
String exe = System.getProperty("java.home") + File.separator + "bin" +
File.separator;
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
String osname = System.getProperty("os.name");
if (osname.equals("SunOS") && arch.equals("sparcv9")) {
exe += "sparcv9/java";
} else if (arch.equals("amd64")) {
} else if (osname.equals("SunOS") && arch.equals("amd64")) {
exe += "amd64/java";
} else {
exe += "java";

2
jdk/test/demo/jvmti/hprof/CpuOldTest.java
View file

@ -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
*/

2
jdk/test/demo/jvmti/hprof/CpuSamplesTest.java
View file

@ -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
*/

2
jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java
View file

@ -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
*

2
jdk/test/demo/jvmti/hprof/CpuTimesTest.java
View file

@ -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
*/

2
jdk/test/demo/jvmti/hprof/HeapAllTest.java
View file

@ -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
*/

2
jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java
View file

@ -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
*/

2
jdk/test/demo/jvmti/hprof/HeapDumpTest.java
View file

@ -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
*/

2
jdk/test/demo/jvmti/hprof/HeapSitesTest.java
View file

@ -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
*/

2
jdk/test/demo/jvmti/hprof/OptionsTest.java
View file

@ -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
*/

3
jdk/test/java/io/Serializable/enum/array/Test.java
View file

@ -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.*;

4
jdk/test/java/io/Serializable/enum/badResolve/Write.java
View file

@ -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
*/

3
jdk/test/java/io/Serializable/enum/basic/Test.java
View file

@ -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.*;

3
jdk/test/java/io/Serializable/enum/classObject/Test.java
View file

@ -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.*;

4
jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java
View file

@ -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
*/

3
jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java
View file

@ -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.*;

3
jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java
View file

@ -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.*;

3
jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java
View file

@ -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.*;

4
jdk/test/java/io/Serializable/enum/missingConstant/Write.java
View file

@ -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
*/

3
jdk/test/java/io/Serializable/enum/unshared/Test.java
View file

@ -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.*;

3
jdk/test/java/lang/Boolean/MakeBooleanComparable.java
View file

@ -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.*;

3
jdk/test/java/lang/Class/Cast.java
View file

@ -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 {

2
jdk/test/java/lang/Class/IsEnum.java
View file

@ -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.*;

2
jdk/test/java/lang/Class/asSubclass/BasicUnit.java
View file

@ -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
*/

2
jdk/test/java/lang/ClassLoader/Assert.sh
View file

@ -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

3
jdk/test/java/lang/Integer/BitTwiddle.java
View file

@ -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;

3
jdk/test/java/lang/Long/BitTwiddle.java
View file

@ -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;

2
jdk/test/java/lang/Math/Atan2Tests.java
View file

@ -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
*/

2
jdk/test/java/lang/Math/IeeeRecommendedTests.java
View file

@ -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;

2
jdk/test/java/lang/Math/PowTests.java
View file

@ -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
*/

2
jdk/test/java/lang/Math/TanTests.java
View file

@ -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
*/

3
jdk/test/java/lang/Runtime/exec/WinCommand.java
View file

@ -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.*;

3
jdk/test/java/lang/Thread/GenerifyStackTraces.java
View file

@ -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.*;

2
jdk/test/java/lang/Thread/UncaughtExceptions.sh
View file

@ -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

2
jdk/test/java/lang/annotation/UnitTest.java
View file

@ -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;

2
jdk/test/java/lang/annotation/package-info.java
View file

@ -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
*/

2
jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java
View file

@ -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
*/

2
jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java
View file

@ -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
*/

3
jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java
View file

@ -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;

3
jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java
View file

@ -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.*;

3
jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java
View file

@ -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.*;

2
jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java
View file

@ -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.*;

2
jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java
View file

@ -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.*;

3
jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java
View file

@ -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;

2
jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh
View file

@ -27,7 +27,7 @@
# @summary
# @author Mandy Chung
#
# @run compile -source 1.5 InputArgument.java
# @run compile InputArgument.java
# @run shell TestInputArgument.sh
#

2
jdk/test/java/lang/reflect/Constructor/GenericStringTest.java
View file

@ -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.*;

2
jdk/test/java/lang/reflect/Field/GenericStringTest.java
View file

@ -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.*;

2
jdk/test/java/lang/reflect/Generics/StringsAndBounds.java
View file

@ -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.*;

2
jdk/test/java/lang/reflect/Generics/TestC1.java
View file

@ -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
*/

2
jdk/test/java/lang/reflect/Generics/TestC2.java
View file

@ -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
*/

2
jdk/test/java/lang/reflect/Generics/TestN1.java
View file

@ -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
*/

2
jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java
View file

@ -26,8 +26,6 @@
* @bug 4981727
* @summary
* @author Joseph D. Darcy
* @compile -source 1.5 exceptionCauseTest.java
* @run main exceptionCauseTest
*/
import java.io.PrintStream;

2
jdk/test/java/lang/reflect/Generics/getAnnotationTest.java
View file

@ -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.*;

2
jdk/test/java/lang/reflect/Method/Equals.java
View file

@ -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
*/

2
jdk/test/java/lang/reflect/Method/GenericStringTest.java
View file

@ -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.*;

2
jdk/test/java/math/BigDecimal/DivideTests.java
View file

@ -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.*;

2
jdk/test/java/math/BigDecimal/IntegralDivisionTests.java
View file

@ -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 {

2
jdk/test/java/math/BigDecimal/PowTests.java
View file

@ -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.*;

2
jdk/test/java/math/BigDecimal/ToPlainStringTests.java
View file

@ -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.*;

2
jdk/test/java/math/BigDecimal/ZeroScalingTests.java
View file

@ -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.*;

2
jdk/test/java/math/RoundingMode/RoundingModeTests.java
View file

@ -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;

2
jdk/test/java/net/ProxySelector/ProxyTest.java
View file

@ -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
*/

2
jdk/test/java/net/URL/PerConnectionProxy.java
View file

@ -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
*/

2
jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java
View file

@ -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

2
jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java
View file

@ -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

2
jdk/test/java/util/AbstractList/CheckForComodification.java
View file

@ -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.*;

3
jdk/test/java/util/Collections/AddAll.java
View file

@ -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.*;

3
jdk/test/java/util/Collections/Disjoint.java
View file

@ -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.*;

3
jdk/test/java/util/Collections/Frequency.java
View file

@ -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.*;

3
jdk/test/java/util/EnumMap/EnumMapBash.java
View file

@ -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.*;

3
jdk/test/java/util/EnumSet/AllOf.java
View file

@ -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.*;

3
jdk/test/java/util/EnumSet/ComplementOf.java
View file

@ -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.*;

3
jdk/test/java/util/EnumSet/EnumSetBash.java
View file

@ -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.*;

3
jdk/test/java/util/EnumSet/JumboRange.java
View file

@ -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.*;

3
jdk/test/java/util/EnumSet/Range.java
View file

@ -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.*;

4
jdk/test/java/util/Formattable/StockName.java
View file

@ -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;

0
jdk/test/java/util/Formatter/Basic-X.java → jdk/test/java/util/Formatter/Basic-X.java.template
View file

6
jdk/test/java/util/Formatter/genBasic.sh
View file

@ -27,10 +27,10 @@ javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java
gen() {
# if [ $3 = "true" ]
# then $SPP -K$1 -Dtype=$1 -DType=$2 -Kprim<Basic-X.java >Basic$2.java
# else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java >Basic$2.java
# then $SPP -K$1 -Dtype=$1 -DType=$2 -Kprim<Basic-X.java.template >Basic$2.java
# else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java.template >Basic$2.java
# fi
java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java >Basic$2.java
java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java.template >Basic$2.java
}
gen boolean Boolean prim "" "" ""

3
jdk/test/java/util/IdentityHashMap/ToString.java
View file

@ -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
*/

2
jdk/test/java/util/Locale/Bug4175998Test.java
View file

@ -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
*/

2
jdk/test/java/util/UUID/UUIDTest.java
View file

@ -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
*/

2
jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
View file

@ -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

Some files were not shown because too many files have changed in this diff Show more