diff --git a/test/java/rmi/MarshalledObject/compare/Compare.java b/test/java/rmi/MarshalledObject/compare/Compare.java index 96ea46f76db42cce3459971e82dd32524792e383..2032264692036478128c317546050a5fcdcb474c 100644 --- a/test/java/rmi/MarshalledObject/compare/Compare.java +++ b/test/java/rmi/MarshalledObject/compare/Compare.java @@ -29,7 +29,6 @@ * not involved in location should be compared. * @author Ken Arnold * - * @build Compare * @run main Compare 11 annotatedRef */ diff --git a/test/java/rmi/MarshalledObject/compare/HashCode.java b/test/java/rmi/MarshalledObject/compare/HashCode.java index 6a0266b927b62b7a55840e3e73d6ead7bcab1b8d..768e418ae5b223c5a606befd1c284c7780961a93 100644 --- a/test/java/rmi/MarshalledObject/compare/HashCode.java +++ b/test/java/rmi/MarshalledObject/compare/HashCode.java @@ -27,7 +27,6 @@ * @summary MarshalledObject with null throws NullPointerException * @author Ken Arnold * - * @build HashCode * @run main HashCode 11 annotatedRef */ diff --git a/test/java/rmi/MarshalledObject/compare/NullReference.java b/test/java/rmi/MarshalledObject/compare/NullReference.java index f8ff9a1a4fa0ca609c95a63a060afbac2822e1ec..5210e948b5179d3e5872f3f07f5be37714af7454 100644 --- a/test/java/rmi/MarshalledObject/compare/NullReference.java +++ b/test/java/rmi/MarshalledObject/compare/NullReference.java @@ -27,7 +27,6 @@ * @summary MarshalledObject with null throws NullPointerException * @author Ken Arnold * - * @build NullReference * @run main NullReference */ diff --git a/test/java/rmi/Naming/DefaultRegistryPort.java b/test/java/rmi/Naming/DefaultRegistryPort.java index 4290bf563be96382c29d25738984edce5367ffab..a4c49792536b6234838f78ad7eeb94b4985567ab 100644 --- a/test/java/rmi/Naming/DefaultRegistryPort.java +++ b/test/java/rmi/Naming/DefaultRegistryPort.java @@ -28,7 +28,6 @@ * @author Dana Burns * @library ../testlibrary * @build TestLibrary - * @build DefaultRegistryPort * @run main DefaultRegistryPort */ diff --git a/test/java/rmi/Naming/LookupIPv6.java b/test/java/rmi/Naming/LookupIPv6.java index ebdd9f3efae963b832b164525f4a6a9d258d4084..da6c62cbc83d7c38daf18a04f5ee1d1a27993613 100644 --- a/test/java/rmi/Naming/LookupIPv6.java +++ b/test/java/rmi/Naming/LookupIPv6.java @@ -22,12 +22,11 @@ */ /* @test + * @summary Ensure that java.rmi.Naming.lookup can handle URLs containing + * IPv6 addresses. * @bug 4402708 * * @run main/othervm -Djava.net.preferIPv6Addresses=true LookupIPv6 - * - * @summary Ensure that java.rmi.Naming.lookup can handle URLs containing - * IPv6 addresses. */ import java.net.InetAddress; diff --git a/test/java/rmi/Naming/RmiIsNoScheme.java b/test/java/rmi/Naming/RmiIsNoScheme.java index 865a07c995d4cd0e9ca68e247a78ed9efc69a03e..fe6d1ab4031c83da93668da53e7386fe2e5d79ff 100644 --- a/test/java/rmi/Naming/RmiIsNoScheme.java +++ b/test/java/rmi/Naming/RmiIsNoScheme.java @@ -30,7 +30,6 @@ * * @library ../testlibrary * @build TestLibrary - * @build RmiIsNoScheme * @run main/othervm RmiIsNoScheme */ diff --git a/test/java/rmi/Naming/UnderscoreHost.java b/test/java/rmi/Naming/UnderscoreHost.java index 0d7375693c44df3d038d5f7ef9cbe1140b4c25b5..b88ca628e9a89f7f4399d44e317948fc6d0d158a 100644 --- a/test/java/rmi/Naming/UnderscoreHost.java +++ b/test/java/rmi/Naming/UnderscoreHost.java @@ -29,8 +29,7 @@ * @author Vinod Johnson * * @library ../testlibrary - * @build TestLibrary - * @build UnderscoreHost UnderscoreHost_Stub + * @build TestLibrary UnderscoreHost_Stub * @run main/othervm UnderscoreHost */ diff --git a/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java b/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java index 0d367974b2e241cd5200f5f46a99f248e3225ad6..725d9ca6c7afe5a03c9f7c0b28d67de8494cdaed 100644 --- a/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java +++ b/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java @@ -21,14 +21,13 @@ * questions. */ -/** +/* * @test * @bug 4254808 * @summary Naming assumes '/' is present in relative URL; change in URL causes regression * @author Dana Burns * @library ../../testlibrary - * @build TestLibrary - * @build Legal LegalRegistryNames LegalRegistryNames_Stub + * @build TestLibrary Legal LegalRegistryNames_Stub * @run main LegalRegistryNames */ diff --git a/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java b/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java index 648708869ada84e63c1e2707e6f2270d3a8596bf..32cbe5ff481274f9a8ba6ccb56e51cbcffa2f4b0 100644 --- a/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java +++ b/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java @@ -28,10 +28,9 @@ * as when the default java.lang.SecurityManager is set, which with the * default "java.security" file in the JDK means that access to packages in * the sun.* package hierarchy is denied (without explicit runtime permission - * "accessClassInPackge.*"). + * "accessClassInPackage.*"). * @author Peter Jones * - * @build CheckPackageAccess * @run main/othervm CheckPackageAccess */ diff --git a/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java b/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java index 9bd8475a44bc42b7f4b8953cf9ec27bf800c922b..fce32f9f06aada3eca2d7b28a6ff4555362bdda2 100644 --- a/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java +++ b/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java @@ -36,8 +36,7 @@ * functionality is in place * * @library ../../../testlibrary - * @build TestLibrary RMID - * @build ActivateMe CheckActivateRef_Stub CheckActivateRef + * @build TestLibrary RMID ActivateMe CheckActivateRef_Stub * @run main/othervm/policy=security.policy/timeout=240 -Djava.rmi.server.ignoreStubClasses=true CheckActivateRef * @run main/othervm/policy=security.policy/timeout=240 -Djava.rmi.server.ignoreStubClasses=false CheckActivateRef */ diff --git a/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java b/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java index ae7b843b1a95c5f2b187b1030daddaa49aed9e1f..b6e4abd433c16544d54212e66be816124f7a02a6 100644 --- a/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java +++ b/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java @@ -28,10 +28,7 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build MyRMI - * @build CheckAnnotations - * @build CheckAnnotations_Stub + * @build TestLibrary RMID MyRMI CheckAnnotations_Stub * @run main/othervm/policy=security.policy/timeout=480 CheckAnnotations */ diff --git a/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java b/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java index e3a1467ceeef196e0d033c96af9f89d622da220f..3d0694107e943fdf4cf3e7eb21514168cf77ae44 100644 --- a/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java +++ b/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java @@ -24,14 +24,11 @@ /* @test * @bug 4289544 * @summary ActivationGroupImpl.newInstance does not set context classloader for impl - * * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build MyRMI - * @build CheckImplClassLoader ActivatableImpl - * @build ActivatableImpl ActivatableImpl_Stub + * @build TestLibrary RMID + * MyRMI ActivatableImpl ActivatableImpl ActivatableImpl_Stub * @run main/othervm/policy=security.policy/timeout=150 CheckImplClassLoader */ diff --git a/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java b/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java index 59f5c99dc77cea25e480f4731427aadf8f8a39d6..b46142f1a2a73d7c9963d14a8cccba1e1fb2afdf 100644 --- a/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java +++ b/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java @@ -27,8 +27,8 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build RMID ActivationLibrary TestLibrary - * @build ActivateMe CheckRegisterInLog CheckRegisterInLog_Stub + * @build TestLibrary RMID ActivationLibrary + * ActivateMe CheckRegisterInLog_Stub * @run main/othervm/policy=security.policy/timeout=240 CheckRegisterInLog */ diff --git a/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java b/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java index 4d4d07367222879519b19607f13af4681ec5dff3..41a28868ecdc64d905943128ca1275f396807d81 100644 --- a/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java +++ b/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java @@ -22,14 +22,12 @@ */ /* @test - * @author Laird Dornin * @bug 4164971 * @summary allow non-public activatable class and/or constructor + * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary RMID - * @build ActivateMe - * @build CreatePrivateActivatable + * @build TestLibrary RMID ActivateMe * @run main/othervm/policy=security.policy/timeout=240 CreatePrivateActivatable */ diff --git a/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java b/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java index 1bb909a79bffe839c570d53c0b56af807aaa2bae..42d309b34d9dcf8d3fc160951fc295986adf6328 100644 --- a/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java +++ b/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java @@ -32,11 +32,7 @@ * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build DownloadParameterClass - * @build Foo - * @build FooReceiverImpl - * @build FooReceiverImpl_Stub - * @build Bar + * Foo FooReceiverImpl FooReceiverImpl_Stub Bar * @run main/othervm/policy=security.policy/timeout=240 DownloadParameterClass */ diff --git a/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java b/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java index 3d82bfb86afba4de45ff56ecbf3f9e55b34d8e93..7ee451d73288ef1d331987f1a81a50285153a11d 100644 --- a/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java +++ b/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java @@ -23,14 +23,11 @@ /* @test * @bug 4128620 - * * @summary synopsis: NoSuchMethodError should be elucidated - * * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary RMID - * @build ActivateMe ElucidateNoSuchMethod ElucidateNoSuchMethod_Stub + * @build TestLibrary RMID ActivateMe ElucidateNoSuchMethod_Stub * @run main/othervm/policy=security.policy/timeout=240 ElucidateNoSuchMethod */ diff --git a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh index 7d15638cdb13e2bff1a79d8c50edc9fb5d784961..923249652732100d9e1941e74f8a37c46e90d15e 100644 --- a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh +++ b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh @@ -28,7 +28,7 @@ # set to the impl's class loader) when the impl is activated. # @library ../../../testlibrary # @build TestLibrary RMID ActivationLibrary -# @build ExtLoadedImplTest ExtLoadedImpl ExtLoadedImpl_Stub CheckLoader +# ExtLoadedImplTest ExtLoadedImpl ExtLoadedImpl_Stub CheckLoader # @run shell ext.sh OS=`uname -s` diff --git a/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java b/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java index 679114806ff2821e940994d92ad1c28883d14923..9af0bf316001f66f868f602b2da70fc2f92ed931 100644 --- a/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java +++ b/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java @@ -27,9 +27,8 @@ * @author Laird Dornin * * @library ../../../testlibrary - * @build ActivateMe - * @build ForceLogSnapshot - * @build ForceLogSnapshot_Stub + * @build TestLibrary RMID ActivationLibrary + * ActivateMe ForceLogSnapshot_Stub * @run main/othervm/policy=security.policy/timeout=640 ForceLogSnapshot */ diff --git a/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java b/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java index a1b02b1eab441aaf3482927ad1b6ed28e331d63c..238d3473a9e85375b55399851cb25e93cd90d056 100644 --- a/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java +++ b/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java @@ -29,10 +29,7 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build InactiveGroup - * @build InactiveGroup_Stub + * @build TestLibrary RMID ActivationLibrary ActivateMe InactiveGroup_Stub * @run main/othervm/policy=security.policy/timeout=240 InactiveGroup */ diff --git a/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java b/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java index eee264f2985f8cb032d59bdcd53b446bef101eac..ce154c4ca9962c0969aba8ace5aedd86fbe89787 100644 --- a/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java +++ b/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java @@ -24,14 +24,12 @@ /* * @test * @bug 6245733 - * * @summary synopsis: rmid's registry's list operation doesn't include * activation system * @author Ann Wollrath * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build LookupActivationSystem * @run main/othervm/timeout=240 LookupActivationSystem */ diff --git a/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java b/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java index 9ad2d5482dc18d32029a46e87dc6800c467e81ba..2cd5a634534cb981bc92221cfba229a405c3491c 100644 --- a/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java +++ b/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java @@ -23,15 +23,11 @@ /* @test * @bug 4138056 - * * @summary synopsis: Activating objects from an Activatable constructor causes deadlock * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build NestedActivate - * @build NestedActivate_Stub + * @build TestLibrary RMID ActivationLibrary ActivateMe NestedActivate_Stub * @run main/othervm/policy=security.policy/timeout=240 NestedActivate */ diff --git a/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java b/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java index 76d68e9970a6c86bf46f06e11ff6789e755b56e4..625661ba432d332b67715c5e95a2ac3e69d153bc 100644 --- a/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java +++ b/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java @@ -23,16 +23,13 @@ /* @test * @bug 4115296 - * * @summary synopsis: NoSuchObjectException not thrown for non-existent * activatable objects * @author Ann Wollrath * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build NonExistentActivatable - * @build NonExistentActivatable_Stub + * ActivateMe NonExistentActivatable_Stub * @run main/othervm/policy=security.policy/timeout=240 NonExistentActivatable */ diff --git a/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java b/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java index 164a84209bba9b7c44df378fe644bd40d8c3fcc7..b403c28441b5f3d963792f5155fa3de5f3d41d1e 100644 --- a/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java +++ b/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java @@ -28,10 +28,7 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build ActivateMe - * @build RestartCrashedService - * @build RestartCrashedService_Stub + * @build TestLibrary RMID ActivateMe RestartCrashedService_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartCrashedService */ diff --git a/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java b/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java index 31750985e6d40c58e9969ffb80cbb7d487dd1c3e..c53053e7315b46c5b236d818d60f4f923ea72d27 100644 --- a/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java +++ b/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java @@ -28,8 +28,7 @@ * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build RestartLatecomer - * @build RestartLatecomer_Stub + * RestartLatecomer RestartLatecomer_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartLatecomer */ diff --git a/test/java/rmi/activation/Activatable/restartService/RestartService.java b/test/java/rmi/activation/Activatable/restartService/RestartService.java index a98ce832a2bb470b8f91107d74598b23daa445f9..973916f083ee3f1529d630e5b500f841c3c8650f 100644 --- a/test/java/rmi/activation/Activatable/restartService/RestartService.java +++ b/test/java/rmi/activation/Activatable/restartService/RestartService.java @@ -23,15 +23,11 @@ /* @test * @bug 4095165 4321151 - * @summary synopsis: activator should restart daemon services * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build RestartService - * @build RestartService_Stub + * @build TestLibrary RMID ActivationLibrary ActivateMe RestartService_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartService */ diff --git a/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java b/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java index 162eb3861e481c9da4dd4e2976bf0a11ccf722b6..64233bfd6f1b446b3f283c53e11fd7a026a98464 100644 --- a/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java +++ b/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java @@ -28,11 +28,8 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build TestSecurityManager - * @build RegisteringActivatable - * @build ShutdownGracefully - * @build ShutdownGracefully_Stub + * @build TestLibrary RMID + * TestSecurityManager RegisteringActivatable ShutdownGracefully_Stub * @run main/othervm/policy=security.policy/timeout=700 ShutdownGracefully */ diff --git a/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java b/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java index 5d8c50c56417f3568bdc06916613bd58bdecbd37..412901ea7425a60067a01eaf7705eda9fa3c0fcd 100644 --- a/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java +++ b/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java @@ -23,16 +23,12 @@ /* @test * @bug 4115331 - * @summary synopsis: activatable object fails to go inactive after * unregister/inactive sequence. * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build UnregisterInactive - * @build UnregisterInactive_Stub + * @build TestLibrary RMID ActivationLibrary ActivateMe UnregisterInactive_Stub * @run main/othervm/policy=security.policy/timeout=240 UnregisterInactive */ diff --git a/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java b/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java index a5a5b0d374d32c59a10e0f2300b03215a4eeb843..a7d7643977b9119afe2789a0e53d41e31dc51016 100644 --- a/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java +++ b/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java @@ -31,11 +31,8 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build ActivateMe - * @build ActivateFails - * @build ActivateFails_Stub - * @build ShutdownThread + * @build TestLibrary RMID ActivationLibrary + * ActivateMe ActivateFails_Stub ShutdownThread * @run main/othervm/policy=security.policy/timeout=240 ActivateFails */ diff --git a/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java b/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java index f7f8643333c4805d9d65bb56e1e75ea4b891c6c1..880f1e8a8a6ac4c1427f24ed23b138568198f5df 100644 --- a/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java +++ b/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java @@ -33,9 +33,7 @@ * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build MyActivationGroupImpl - * @build DownloadActivationGroup - * @build DownloadActivationGroup_Stub + * DownloadActivationGroup MyActivationGroupImpl DownloadActivationGroup_Stub * @run main/othervm/policy=security.policy/timeout=240 DownloadActivationGroup */ diff --git a/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java b/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java index bd475029687db7ed5bb92838b03ec3e5b49e6e46..f37cbaeb79f477f26872f1f4ad5282b3821bf327 100644 --- a/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java +++ b/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java @@ -21,16 +21,15 @@ * questions. */ -/** +/* * @test * @bug 4252236 * @summary ActivationGroupDesc should not do early binding of default classname - * @library ../../../testlibrary - * - * @build CheckDefaultGroupName + * @author Laird Dornin * + * @library ../../../testlibrary + * @build TestLibrary * @run main CheckDefaultGroupName - * @author Laird Dornin */ import java.rmi.activation.*; diff --git a/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java b/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java index 41670ee1eb20fb0fd5fe59a66436d16f9ded7dc2..391a86273b16a098f37f37a71898dafe63bd7bbf 100644 --- a/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java +++ b/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java @@ -23,15 +23,13 @@ /* @test * @bug 4720528 - * * @summary synopsis: (spec) ActivationSystem.activeGroup spec should be * relaxed (duplicate call to activeGroup with same instantiator and * incarnation should not throw ActivationException; it should succeed) * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID - * @build IdempotentActiveGroup + * @build TestLibrary RMID ActivationLibrary * @run main/othervm/policy=security.policy/timeout=480 IdempotentActiveGroup */ diff --git a/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java b/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java index 4f3d51e4646f334b9f9730d7e71762b49741dde5..19034e511a6f552b2a675991efb90b2b2ad294bc 100644 --- a/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java +++ b/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java @@ -29,9 +29,8 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build ActivateMe - * @build ModifyDescriptor - * @build ModifyDescriptor_Stub + * @build TestLibrary RMID ActivationLibrary + * ActivateMe ModifyDescriptor_Stub * @run main/othervm/policy=security.policy/timeout=240 ModifyDescriptor */ diff --git a/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java b/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java index cc7810407eb3d0610fca4a8553a83f174706c5da..d987f93b238685dd38171c3ce0b084652d6fc5ba 100644 --- a/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java +++ b/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java @@ -24,14 +24,11 @@ /* @test * @bug 4179055 * @summary Some java apps need to have access to read "accessClassInPackage.sun.rmi.server" - * * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe ActivationLibrary - * @build CanCreateStubs - * @build StubClassesPermitted - * @build StubClassesPermitted_Stub + * @build TestLibrary RMID ActivationLibrary + * CanCreateStubs StubClassesPermitted_Stub * @run main/othervm/policy=security.policy/secure=java.lang.SecurityManager/timeout=240 StubClassesPermitted */ diff --git a/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java b/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java index a2b4076495aef273e2dbe7452aa92af90d3b6434..59fee9da723beb8b1eeda5fdc673ce2c036fa8d4 100644 --- a/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java +++ b/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java @@ -24,16 +24,12 @@ /* @test * @bug 4134233 * @bug 4213186 - * * @summary synopsis: ActivationSystem.unregisterGroup should unregister objects in group * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build ActivateMe CallbackInterface - * @build UnregisterGroup - * @build UnregisterGroup_Stub - * @build Callback_Stub + * @build TestLibrary RMID ActivationLibrary + * ActivateMe CallbackInterface UnregisterGroup_Stub Callback_Stub * @run main/othervm/policy=security.policy/timeout=480 UnregisterGroup */ diff --git a/test/java/rmi/activation/CommandEnvironment/NullOptions.java b/test/java/rmi/activation/CommandEnvironment/NullOptions.java index 3ef97e8d77ce66a701dc41f5d0617bb2dd238b46..a1ec946c21b4b505c5c15c695ef266c87274ddeb 100644 --- a/test/java/rmi/activation/CommandEnvironment/NullOptions.java +++ b/test/java/rmi/activation/CommandEnvironment/NullOptions.java @@ -27,7 +27,6 @@ * ActivationGroupDesc.CommandEnvironment * @author Ann Wollrath * - * @build NullOptions * @run main/othervm/timeout=240 NullOptions */ diff --git a/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java b/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java index d89450d615178363fc98945996863fa63b94344d..7b1a9688ad44ffd119f7065f0fd800cbce633a83 100644 --- a/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java +++ b/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java @@ -35,9 +35,10 @@ * @author Adrian Colley * * @library ../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build Eliza Retireable Doctor Doctor_Stub SetChildEnv - * @run main/othervm/timeout=240/policy=security.policy -Djava.compiler=NONE SetChildEnv + * @build TestLibrary RMID ActivationLibrary + * Eliza Retireable Doctor Doctor_Stub + * @run main/othervm/timeout=240/policy=security.policy + * -Djava.compiler=NONE SetChildEnv */ import java.rmi.*; import java.util.Properties; diff --git a/test/java/rmi/activation/checkusage/CheckUsage.java b/test/java/rmi/activation/checkusage/CheckUsage.java index 66ff7ad944551995434378c98820a5133099dfc1..2b514e1f37076ed77f8645b7050df8734d337ac8 100644 --- a/test/java/rmi/activation/checkusage/CheckUsage.java +++ b/test/java/rmi/activation/checkusage/CheckUsage.java @@ -25,7 +25,7 @@ * @bug 4259564 * * @library ../../testlibrary - * @build TestLibrary JavaVM CheckUsage + * @build TestLibrary JavaVM * @run main/othervm CheckUsage */ diff --git a/test/java/rmi/activation/log/LogTest.java b/test/java/rmi/activation/log/LogTest.java index 2e503b916a40f046c00c201d769ccd8c7e621165..53efeb49cedcdf5a81e1ac9b9aa4f58e2e5068ae 100644 --- a/test/java/rmi/activation/log/LogTest.java +++ b/test/java/rmi/activation/log/LogTest.java @@ -29,7 +29,6 @@ * boundaries * @author Ann Wollrath * - * @build LogTest * @run main/othervm/timeout=240 LogTest */ diff --git a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java index 345aca33a608c4e5587fb29a032e2ab566780414..4611a83bda51f57c2effac507b9054df696f4cc8 100644 --- a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java +++ b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java @@ -29,8 +29,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build RMID ActivationLibrary - * @build InheritedChannelNotServerSocket + * @build TestLibrary RMID ActivationLibrary * @run main/othervm/timeout=240 InheritedChannelNotServerSocket */ diff --git a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java index 008b391acc4859a7afdd49e6a2e4f7939504ca95..be9234d2fb96e8ac248e8ad4f0251875af2a8f2b 100644 --- a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java +++ b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java @@ -27,9 +27,7 @@ * @author Ann Wollrath * * @library ../../testlibrary - * @build RMID ActivationLibrary - * @build RmidViaInheritedChannel - * @build TestLibrary + * @build TestLibrary RMID ActivationLibrary * @run main/othervm/timeout=240 RmidViaInheritedChannel */ diff --git a/test/java/rmi/dgc/VMID/CheckVMID.java b/test/java/rmi/dgc/VMID/CheckVMID.java index dcdc9fd2ccff17404a8b4c347149cc3192e9a4cb..0b69ff4cc30d6acef7f060aaced2e6311038d609 100644 --- a/test/java/rmi/dgc/VMID/CheckVMID.java +++ b/test/java/rmi/dgc/VMID/CheckVMID.java @@ -30,7 +30,7 @@ * @author Ann Wollrath * * @library ../../testlibrary - * @build CheckVMID + * @build TestLibrary * @run main/othervm/policy=security.policy CheckVMID */ diff --git a/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java b/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java index c416063113a728f29c6c93781aa7792c68ffc390..6a47245dec9050757a69919825088b36084ea343 100644 --- a/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java +++ b/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java @@ -30,8 +30,7 @@ * rather than pinning it indefinitely. * @author Peter Jones * - * @build DGCAckFailure - * @build DGCAckFailure_Stub + * @build DGCAckFailure DGCAckFailure_Stub * @run main/othervm DGCAckFailure */ diff --git a/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java b/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java index 246c2b541a390f86722fc2168cf6438e3ce4275c..4043268838d1b52908356be17786959f15d2ff61 100644 --- a/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java +++ b/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java @@ -31,9 +31,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build TestLibrary - * @build DGCImplInsulation - * @build DGCImplInsulation_Stub + * @build TestLibrary DGCImplInsulation_Stub * @run main/othervm/policy=security.policy DGCImplInsulation */ diff --git a/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java b/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java index 10cb15f30eb2fedd98e8a69dca7b5cf18055caed..b2f0af6506b8d00d4daaa1cf3f834ad9be3eb74b 100644 --- a/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java +++ b/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java @@ -29,8 +29,7 @@ * renewing that lease at all after the first failure. * @author Peter Jones (inspired by Adrian Colley's test case in 4268258) * - * @build RetryDirtyCalls - * @build RetryDirtyCalls_Stub + * @build RetryDirtyCalls RetryDirtyCalls_Stub * @run main/othervm RetryDirtyCalls */ diff --git a/test/java/rmi/invalidName/InvalidName.java b/test/java/rmi/invalidName/InvalidName.java index 8d522f51592c1573af4703c061b66830db9844f2..74da1a5d53d28b5329840c12dce709ca9049f58c 100644 --- a/test/java/rmi/invalidName/InvalidName.java +++ b/test/java/rmi/invalidName/InvalidName.java @@ -32,7 +32,7 @@ * @author Laird Dornin * * @library ../testlibrary - * @build InvalidName + * @build TestLibrary * @run main/othervm InvalidName */ diff --git a/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java b/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java index 15b98fc851bec6d54c6b954c44a6eab98c47834e..08d030ec876ec8bf9ef4329e58edc4043b3d17cb 100644 --- a/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java +++ b/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java @@ -27,8 +27,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build StreamPipe TestParams TestLibrary JavaVM RMID - * @build AltSecurityManager TestSecurityManager + * @build TestLibrary JavaVM RMID TestSecurityManager * @run main/othervm AltSecurityManager */ diff --git a/test/java/rmi/registry/checkusage/CheckUsage.java b/test/java/rmi/registry/checkusage/CheckUsage.java index 71deb55ad9929a6735f78fd3000efe1f07b11802..19dac5b600ab3a1db2b4df42dd2a808ef538cf9f 100644 --- a/test/java/rmi/registry/checkusage/CheckUsage.java +++ b/test/java/rmi/registry/checkusage/CheckUsage.java @@ -27,7 +27,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build TestLibrary JavaVM CheckUsage + * @build TestLibrary JavaVM * @run main/othervm CheckUsage */ diff --git a/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java b/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java index 9e8cbba8bf68c37962f036b52f457a957c154d26..99ac5f091a6a59b159dc3331e674fa4671bc909b 100644 --- a/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java +++ b/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java @@ -30,7 +30,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build ClassPathCodebase Dummy TestLibrary + * @build TestLibrary Dummy * @run main/othervm/policy=security.policy ClassPathCodebase */ diff --git a/test/java/rmi/registry/interfaceHash/InterfaceHash.java b/test/java/rmi/registry/interfaceHash/InterfaceHash.java index 7782412571993e808c8bf9283717b0e4e78128ca..2eba1d6ac1a73707040a59b005ee99e811b1689b 100644 --- a/test/java/rmi/registry/interfaceHash/InterfaceHash.java +++ b/test/java/rmi/registry/interfaceHash/InterfaceHash.java @@ -36,9 +36,7 @@ * * @author Peter Jones * @library ../../testlibrary - * @build InterfaceHash - * @build ReferenceRegistryStub - * @build TestLibrary + * @build TestLibrary ReferenceRegistryStub * @run main/othervm InterfaceHash */ diff --git a/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java b/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java index e75a60989d7fe1f38297efadeec8a3eadf5f079d..1945ebe8db353bdfefcabe8be509e5826b2a66a6 100644 --- a/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java +++ b/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java @@ -28,7 +28,6 @@ * * @library ../../testlibrary * @build TestLibrary - * @build MultipleRegistries * @run main/othervm/timeout=240 MultipleRegistries */ diff --git a/test/java/rmi/registry/readTest/readTest.sh b/test/java/rmi/registry/readTest/readTest.sh index d7f1568f62c8bc3443b392c3c764ccec69882ba6..47221ae51a1a4ac9447a50e0a539ec6253c98165 100644 --- a/test/java/rmi/registry/readTest/readTest.sh +++ b/test/java/rmi/registry/readTest/readTest.sh @@ -25,7 +25,7 @@ # @bug 7102369 7094468 7100592 # @library ../../testlibrary # @build TestLibrary -# @summary remove java.rmi.server.codebase property parsing from registyimpl +# @summary remove java.rmi.server.codebase property parsing from RegistryImpl # @run shell readTest.sh OS=`uname -s` diff --git a/test/java/rmi/registry/reexport/Reexport.java b/test/java/rmi/registry/reexport/Reexport.java index 042088e65af93a6bf5991e96584b84012be36460..c209f7c55b85eda6be22d64d3fa6a3b75f7652f0 100644 --- a/test/java/rmi/registry/reexport/Reexport.java +++ b/test/java/rmi/registry/reexport/Reexport.java @@ -25,9 +25,7 @@ * @bug 4120329 * @summary RMI registry creation is impossible if first attempt fails. * @library ../../testlibrary - * @build StreamPipe TestParams TestLibrary JavaVM - * @build RegistryRunner RegistryRunner_Stub - * @build Reexport + * @build TestLibrary JavaVM RegistryRunner RegistryRunner_Stub * @run main/othervm Reexport */ diff --git a/test/java/rmi/reliability/benchmark/runRmiBench.sh b/test/java/rmi/reliability/benchmark/runRmiBench.sh index cfa23f7781158fbc24b9148142436a97d509d447..98a31d1ddd19eadeb2a775d57b2a85a29f9e5d7d 100644 --- a/test/java/rmi/reliability/benchmark/runRmiBench.sh +++ b/test/java/rmi/reliability/benchmark/runRmiBench.sh @@ -27,20 +27,20 @@ # used to run the test under JTREG. # # @build bench.BenchInfo bench.HtmlReporter bench.Util bench.Benchmark -# @build bench.Reporter bench.XmlReporter bench.ConfigFormatException -# @build bench.Harness bench.TextReporter bench.rmi.BenchServer -# @build bench.rmi.DoubleArrayCalls bench.rmi.LongCalls bench.rmi.ShortCalls -# @build bench.rmi.BenchServerImpl bench.rmi.DoubleCalls -# @build bench.rmi.Main bench.rmi.SmallObjTreeCalls -# @build bench.rmi.BooleanArrayCalls bench.rmi.ExceptionCalls -# @build bench.rmi.NullCalls bench.rmi.BooleanCalls bench.rmi.ExportObjs -# @build bench.rmi.ObjArrayCalls bench.rmi.ByteArrayCalls -# @build bench.rmi.FloatArrayCalls bench.rmi.ObjTreeCalls -# @build bench.rmi.ByteCalls bench.rmi.FloatCalls bench.rmi.ProxyArrayCalls -# @build bench.rmi.CharArrayCalls bench.rmi.IntArrayCalls -# @build bench.rmi.RemoteObjArrayCalls bench.rmi.CharCalls bench.rmi.IntCalls -# @build bench.rmi.ClassLoading bench.rmi.LongArrayCalls -# @build bench.rmi.ShortArrayCalls bench.rmi.altroot.Node +# bench.Reporter bench.XmlReporter bench.ConfigFormatException +# bench.Harness bench.TextReporter bench.rmi.BenchServer +# bench.rmi.DoubleArrayCalls bench.rmi.LongCalls bench.rmi.ShortCalls +# bench.rmi.BenchServerImpl bench.rmi.DoubleCalls +# bench.rmi.Main bench.rmi.SmallObjTreeCalls +# bench.rmi.BooleanArrayCalls bench.rmi.ExceptionCalls +# bench.rmi.NullCalls bench.rmi.BooleanCalls bench.rmi.ExportObjs +# bench.rmi.ObjArrayCalls bench.rmi.ByteArrayCalls +# bench.rmi.FloatArrayCalls bench.rmi.ObjTreeCalls +# bench.rmi.ByteCalls bench.rmi.FloatCalls bench.rmi.ProxyArrayCalls +# bench.rmi.CharArrayCalls bench.rmi.IntArrayCalls +# bench.rmi.RemoteObjArrayCalls bench.rmi.CharCalls bench.rmi.IntCalls +# bench.rmi.ClassLoading bench.rmi.LongArrayCalls +# bench.rmi.ShortArrayCalls bench.rmi.altroot.Node # # @run shell/timeout=1800 runRmiBench.sh # diff --git a/test/java/rmi/reliability/benchmark/runSerialBench.sh b/test/java/rmi/reliability/benchmark/runSerialBench.sh index aac0d3ff7681509e3020a122d7b50bb90ead9381..28fa90a0099a5a432c93828fa53569f8cfaf2ca8 100644 --- a/test/java/rmi/reliability/benchmark/runSerialBench.sh +++ b/test/java/rmi/reliability/benchmark/runSerialBench.sh @@ -27,22 +27,22 @@ # used to run the test under JTREG. # # @build bench.BenchInfo bench.HtmlReporter bench.Util bench.Benchmark -# @build bench.Reporter bench.XmlReporter bench.ConfigFormatException -# @build bench.Harness bench.TextReporter -# @build bench.serial.BooleanArrays bench.serial.Booleans -# @build bench.serial.ByteArrays bench.serial.Bytes bench.serial.CharArrays -# @build bench.serial.Chars bench.serial.ClassDesc bench.serial.Cons -# @build bench.serial.CustomDefaultObjTrees bench.serial.CustomObjTrees -# @build bench.serial.DoubleArrays bench.serial.Doubles -# @build bench.serial.ExternObjTrees bench.serial.FloatArrays -# @build bench.serial.Floats bench.serial.GetPutFieldTrees -# @build bench.serial.IntArrays bench.serial.Ints bench.serial.LongArrays -# @build bench.serial.Longs bench.serial.Main bench.serial.ObjArrays -# @build bench.serial.ObjTrees bench.serial.ProxyArrays -# @build bench.serial.ProxyClassDesc bench.serial.RepeatObjs -# @build bench.serial.ReplaceTrees bench.serial.ShortArrays -# @build bench.serial.Shorts bench.serial.SmallObjTrees -# @build bench.serial.StreamBuffer bench.serial.Strings +# bench.Reporter bench.XmlReporter bench.ConfigFormatException +# bench.Harness bench.TextReporter +# bench.serial.BooleanArrays bench.serial.Booleans +# bench.serial.ByteArrays bench.serial.Bytes bench.serial.CharArrays +# bench.serial.Chars bench.serial.ClassDesc bench.serial.Cons +# bench.serial.CustomDefaultObjTrees bench.serial.CustomObjTrees +# bench.serial.DoubleArrays bench.serial.Doubles +# bench.serial.ExternObjTrees bench.serial.FloatArrays +# bench.serial.Floats bench.serial.GetPutFieldTrees +# bench.serial.IntArrays bench.serial.Ints bench.serial.LongArrays +# bench.serial.Longs bench.serial.Main bench.serial.ObjArrays +# bench.serial.ObjTrees bench.serial.ProxyArrays +# bench.serial.ProxyClassDesc bench.serial.RepeatObjs +# bench.serial.ReplaceTrees bench.serial.ShortArrays +# bench.serial.Shorts bench.serial.SmallObjTrees +# bench.serial.StreamBuffer bench.serial.Strings # # @run shell/timeout=1800 runSerialBench.sh # diff --git a/test/java/rmi/reliability/juicer/AppleUserImpl.java b/test/java/rmi/reliability/juicer/AppleUserImpl.java index 2ed30c65ab802ff98b4569d96679926da32ae164..70b187e25bc115488ac57b1e46ac80e585cef028 100644 --- a/test/java/rmi/reliability/juicer/AppleUserImpl.java +++ b/test/java/rmi/reliability/juicer/AppleUserImpl.java @@ -55,11 +55,10 @@ * has been reached. * * @library ../../testlibrary - * - * @build Apple AppleEvent AppleImpl AppleUserImpl - * @build Orange OrangeEcho OrangeEchoImpl OrangeImpl - * @build ApplicationServer * @build TestLibrary + * Apple AppleEvent AppleImpl + * Orange OrangeEcho OrangeEchoImpl OrangeImpl + * ApplicationServer * * @run main/othervm/policy=security.policy AppleUserImpl -seconds 30 * diff --git a/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java b/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java index 9c20ab40dfbbd4c3fb3dc9fbde894166ab52c9b6..ebe7192f38242f7761d67adba4138e346219b328 100644 --- a/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java +++ b/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java @@ -30,7 +30,6 @@ * ObjID() should still generate sequential object numbers. * @author Peter Jones * - * @build RandomIDs * @run main/othervm RandomIDs random * @run main/othervm -Djava.rmi.server.randomIDs=true RandomIDs random * @run main/othervm -Djava.rmi.server.randomIDs=false RandomIDs sequential diff --git a/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java b/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java index fba4939a35c3c6d934bc05cbb130cc75be7f0b84..6187f0cb17e0a0920902e6b622618215f284da0b 100644 --- a/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java +++ b/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java @@ -33,9 +33,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build DelegateBeforePermissionCheck - * @build Foo + * @build TestLibrary Foo * @run main/othervm DelegateBeforePermissionCheck */ diff --git a/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java b/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java index 51b5bd4f88f7f6dec37132ce0000886432906b8f..7ae4c5ee9ba29cc5acc14eebb081f1bf998ccf63 100644 --- a/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java +++ b/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java @@ -29,7 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build DelegateToContextLoader Dummy + * @build TestLibrary Dummy * @run main/othervm/policy=security.policy/timeout=120 DelegateToContextLoader */ diff --git a/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java b/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java index 34a21bd465151c23d5ff77b81ef79ab845760fda..9df187ab3a34ab5b868d3519e940ce0131790049 100644 --- a/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java +++ b/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java @@ -31,11 +31,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build Receiver - * @build DownloadArrayClass - * @build DownloadArrayClass_Stub - * @build Foo + * @build TestLibrary Receiver DownloadArrayClass_Stub Foo * @run main/othervm/policy=security.policy DownloadArrayClass */ diff --git a/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java b/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java index 0a0cfb70e6768f8c1c4e205a26162e8cb9c11089..5167fc40c2b67f997b740da686a7de026660be08 100644 --- a/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java +++ b/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java @@ -29,7 +29,6 @@ * * @library ../../../testlibrary * @build TestLibrary - * @build NullClass * @run main/othervm NullClass */ diff --git a/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java b/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java index f54a5cf0b9ed7f724a0936b5152e147512f43d6f..10a9cc9b4ac9bff8a3f845d974ca0007a860454f 100644 --- a/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java +++ b/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java @@ -29,9 +29,7 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary - * @build GetClassLoader - * @build Foo + * @build TestLibrary Foo * @run main/othervm/policy=security.policy GetClassLoader */ diff --git a/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java b/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java index 4feed266e96049d1a06a31e88ed06e9e07547ac7..6d29cb2468f4ea1945c0a2aa9cbfe7ae3c466e05 100644 --- a/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java +++ b/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java @@ -30,8 +30,8 @@ * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary FnnClass FnnUnmarshal LoadProxyClasses NonpublicInterface - * @build NonpublicInterface1 PublicInterface PublicInterface1 + * @build TestLibrary FnnClass FnnUnmarshal NonpublicInterface + * NonpublicInterface1 PublicInterface PublicInterface1 * @run main/othervm/policy=security.policy LoadProxyClasses */ diff --git a/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java b/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java index 182db1c69cbcfd1efa1975a91b8e4d2d48b34bc2..93a33b91dd26898eca6166028e53ab035c56a20c 100644 --- a/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java +++ b/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java @@ -30,7 +30,7 @@ * been used for the RMI class loader instance. * @author Peter Jones * - * @build NoSecurityManager Dummy LocalDummy + * @build Dummy LocalDummy * @run main/othervm/timeout=120 NoSecurityManager */ diff --git a/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java b/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java index 56cd08d2bc1fa717333edb1bca06114d943713c7..de3d79b60f64bd864e11eafba3891f977a06667d 100644 --- a/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java +++ b/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java @@ -30,11 +30,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build ContextInsulation - * @build ServiceConfiguration - * @build TestProvider - * @build TestProvider2 + * @build TestLibrary ServiceConfiguration TestProvider TestProvider2 * @run main/othervm/policy=security.policy ContextInsulation */ diff --git a/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java b/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java index 4cb8169ab8a8e6ad50913a4ace432b640e00ee56..f91ef3d1893d1f4bd9a2a9701b28a4284e87c220 100644 --- a/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java +++ b/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java @@ -29,10 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build DefaultProperty - * @build ServiceConfiguration - * @build Foo + * @build TestLibrary ServiceConfiguration Foo * @run main/othervm/policy=security.policy DefaultProperty */ diff --git a/test/java/rmi/server/RMIClassLoader/spi/Installed.java b/test/java/rmi/server/RMIClassLoader/spi/Installed.java index 23ce956b334249e3eae6e5caba2093d60d76616e..d32a8af596d960caa12805c159223aed6c84d35b 100644 --- a/test/java/rmi/server/RMIClassLoader/spi/Installed.java +++ b/test/java/rmi/server/RMIClassLoader/spi/Installed.java @@ -29,11 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build Installed - * @build ServiceConfiguration - * @build TestProvider - * @build TestProvider2 + * @build TestLibrary ServiceConfiguration TestProvider TestProvider2 * @run main/othervm/policy=security.policy Installed */ diff --git a/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java b/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java index e7b157c64801e7e9fbff478f3d6a61f0dd47da5b..d41cef1d924a8f36288da71dd2e542974b49d758 100644 --- a/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java +++ b/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java @@ -29,9 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build InvalidProperty - * @build ServiceConfiguration + * @build TestLibrary ServiceConfiguration * @run main/othervm/policy=security.policy InvalidProperty */ diff --git a/test/java/rmi/server/RMIClassLoader/spi/Property.java b/test/java/rmi/server/RMIClassLoader/spi/Property.java index 427e5a3160e1f8fdaabf1fe9979675fc4462cf1d..6113a6ecb7bd090d3bd4cf22141d37b3bef83a30 100644 --- a/test/java/rmi/server/RMIClassLoader/spi/Property.java +++ b/test/java/rmi/server/RMIClassLoader/spi/Property.java @@ -29,10 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build Property - * @build ServiceConfiguration - * @build TestProvider + * @build TestLibrary ServiceConfiguration TestProvider * @run main/othervm/policy=security.policy Property */ diff --git a/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java b/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java index cd79782c46e5791fd41a9932a26179c6a23f9295..dc8083705266a824651b06439a730e61f568f7e3 100644 --- a/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java +++ b/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java @@ -31,12 +31,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build Receiver - * @build UseCodebaseOnly - * @build UseCodebaseOnly_Stub - * @build Foo - * @build Bar + * @build TestLibrary Receiver UseCodebaseOnly_Stub Foo Bar * @run main/othervm/policy=security.policy UseCodebaseOnly */ diff --git a/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java b/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java index 295b9944a771c1db5cffab20b5552965cd1e81be..d80907e0a2b8e262973a48fdea6d5dec96698e0b 100644 --- a/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java +++ b/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java @@ -30,8 +30,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build UseGetURLs Dummy + * @build TestLibrary Dummy * @run main/othervm/policy=security.policy/timeout=120 UseGetURLs */ diff --git a/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java b/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java index 5868c583b28d688641b56efec28d93691ac96970..5f032ec58cf759b0c59ff758aee60edbe13a3fa4 100644 --- a/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java +++ b/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java @@ -28,11 +28,7 @@ * @author Ann Wollrath * * @library ../../../../testlibrary - * @build Echo - * @build EchoImpl - * @build EchoImpl_Stub - * @build UseCustomSocketFactory - * @build TestLibrary + * @build TestLibrary Echo EchoImpl EchoImpl_Stub * @run main/othervm/policy=security.policy/timeout=360 UseCustomSocketFactory */ diff --git a/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java b/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java index ba6106883696ab3a65d059d838e12d909b435c45..774e823e8571cfbeb8513b1c84b2a956e28571e2 100644 --- a/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java +++ b/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java @@ -29,12 +29,7 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../../testlibrary - * @build Hello - * @build HelloImpl - * @build HelloImpl_Stub - * @build TestLibrary - * @build UseCustomSocketFactory - * @build Compress + * @build TestLibrary Compress Hello HelloImpl HelloImpl_Stub * @run main/othervm/policy=security.policy/timeout=240 UseCustomSocketFactory */ diff --git a/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java b/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java index 13766abd848f7af63309ffea239b00ca6ca26f15..06571df79c11507d1c406dc04b2a74bd4dc2d594 100644 --- a/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java +++ b/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java @@ -29,11 +29,7 @@ * @author Ann Wollrath * * @library ../../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build Echo - * @build EchoImpl - * @build EchoImpl_Stub - * @build UseCustomSocketFactory + * @build TestLibrary RMID JavaVM Echo EchoImpl EchoImpl_Stub * @run main/othervm/policy=security.policy/timeout=120 UseCustomSocketFactory */ diff --git a/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java b/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java index 0023fc5f0c1bed176e9823f6ba1ce3eba42aa52f..ef524a4dd8a000760ead798d8750fa6de99635d9 100644 --- a/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java +++ b/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java @@ -29,9 +29,7 @@ * (specifically: stubs) that contain the instance's RemoteRef. * @author Peter Jones * - * @build NotExtending - * @build NotExtending_Stub - * @build NotExtending_Skel + * @build NotExtending_Stub NotExtending_Skel * @run main/othervm/timeout=240 NotExtending */ diff --git a/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java b/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java index 8b6bccab9a800a1427d89a393fbbce5ecc73c927..b89e3625e3d1497a96d9d6503134e424a63a3fd2 100644 --- a/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java +++ b/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java @@ -21,16 +21,16 @@ * questions. */ -/** +/* * @test * @bug 4251010 * @summary equals does not works on stub objects created with * custom socket AndFactory - * @library ../../../testlibrary + * @author Laird Dornin * - * @build VerifyRemoteEquals + * @library ../../../testlibrary + * @build TestLibrary * @run main/othervm/timeout=40 VerifyRemoteEquals - * @author Laird Dornin */ import java.io.*; diff --git a/test/java/rmi/server/RemoteServer/AddrInUse.java b/test/java/rmi/server/RemoteServer/AddrInUse.java index 9ab8e50d65b1142869c719f73e8b5c4eaf9d801e..34e343b61932b9261183e489aa01741a5d834fb3 100644 --- a/test/java/rmi/server/RemoteServer/AddrInUse.java +++ b/test/java/rmi/server/RemoteServer/AddrInUse.java @@ -26,8 +26,6 @@ * @summary retryServerSocket should not retry on BindException * @author Ann Wollrath * - * @library ../../testlibrary - * @build AddrInUse * @run main/othervm AddrInUse */ diff --git a/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java b/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java index 0716c1a9b1ed4f0197c633f4733f7190124e385a..523c3a08f4ae6c532bd691717278c920f03e1d51 100644 --- a/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java +++ b/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java @@ -31,8 +31,7 @@ * * @author Ann Wollrath * - * @build ChangeHostName - * @build ChangeHostName_Stub + * @build ChangeHostName ChangeHostName_Stub * @run main/othervm ChangeHostName */ diff --git a/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java b/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java index 59663db7dea99cb087096565999c7d46e9a78a54..def2806964dc1333126220c4df8a08d442537403 100644 --- a/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java +++ b/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java @@ -30,6 +30,7 @@ * @bug 6597112 * @summary GC'ing objects whilst being exported to RMI should not cause exceptions * @author Neil Richards , + * @run main GcDuringExport */ import java.rmi.Remote; diff --git a/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java b/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java index dbe2ffe2157e6c4f51381c628e521d61963b9e6b..780e7e5c7f17c6f46fabda2859e50447ba467793 100644 --- a/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java +++ b/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java @@ -32,14 +32,8 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build JavaVM - * @build KeepAliveDuringCall - * @build KeepAliveDuringCall_Stub - * @build ShutdownMonitor - * @build Shutdown - * @build ShutdownImpl - * @build ShutdownImpl_Stub + * @build TestLibrary JavaVM KeepAliveDuringCall_Stub + * ShutdownMonitor Shutdown ShutdownImpl ShutdownImpl_Stub * @run main/othervm KeepAliveDuringCall */ diff --git a/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java b/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java index 743d4611f5f0d7a49d4104b5342fe1dca305d9b3..a165dd81783a582875bca04107d222c8382f3562 100644 --- a/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java +++ b/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java @@ -31,8 +31,7 @@ * IOException (see fix for bugid 4017232). * @author Peter Jones * - * @build MarshalAfterUnexport - * @build MarshalAfterUnexport_Stub + * @build MarshalAfterUnexport MarshalAfterUnexport_Stub * @run main/othervm MarshalAfterUnexport */ diff --git a/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java b/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java index ea1e482fc39db4821ab217a638a4d1ac053f8d10..b72efa456cf55217b7d21edd466890c48ad3da61 100644 --- a/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java +++ b/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java @@ -33,8 +33,7 @@ * @author Peter Jones * @author Ann Wollrath * - * @build MarshalAfterUnexport2 - * @build MarshalAfterUnexport2_Stub + * @build MarshalAfterUnexport2 MarshalAfterUnexport2_Stub * @run main/othervm MarshalAfterUnexport2 */ diff --git a/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java b/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java index 60325dcaa1ed7dcf79ed8abdb49dddf972feebc8..62804feb6e013447a61b5a7cce1964b80530a6a6 100644 --- a/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java +++ b/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java @@ -29,10 +29,7 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build UnexportLeak - * @build UnexportLeak_Stub - * @build TestLibrary - * @build Ping + * @build TestLibrary UnexportLeak_Stub Ping * @run main/othervm UnexportLeak */ diff --git a/test/java/rmi/server/Unmarshal/PrimitiveClasses.java b/test/java/rmi/server/Unmarshal/PrimitiveClasses.java index 8d7b30dbf668be37e0693facf32cd157c7f94f64..b9dfb0c300ecfd5794d5925c46c553511e850200 100644 --- a/test/java/rmi/server/Unmarshal/PrimitiveClasses.java +++ b/test/java/rmi/server/Unmarshal/PrimitiveClasses.java @@ -25,6 +25,7 @@ * @bug 4442373 * @summary Verify that RMI can successfully unmarshal Class objects for * primitive types. + * @run main PrimitiveClasses */ import java.rmi.MarshalledObject; diff --git a/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java b/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java similarity index 100% rename from test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java rename to test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java diff --git a/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java b/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java index 60dce669c51365a75f8ae1104c4c3407ed7f7ecc..95dee537d21516013e94456e7dbbc6c410debc47 100644 --- a/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java +++ b/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java @@ -31,10 +31,8 @@ * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build CheckUnmarshall PoisonPill RuntimeExceptionParameter - * @build CheckUnmarshalOnStopThread - * @build CheckUnmarshalOnStopThread_Stub + * @build TestLibrary CheckUnmarshal CheckUnmarshalOnStopThread_Stub + * PoisonPill RuntimeExceptionParameter * @run main/othervm/timeout=480 CheckUnmarshalOnStopThread */ diff --git a/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java b/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java index 7b7317a8d9b8d3dd52ebe8ae94e6b5aa383deb22..f15883ca8066d43c195128f53c6c90377ad9a147 100644 --- a/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java +++ b/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java @@ -35,9 +35,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build FiniteGCLatency - * @build FiniteGCLatency_Stub - * @build TestLibrary + * @build TestLibrary FiniteGCLatency_Stub * @run main/othervm/timeout=120 FiniteGCLatency */ diff --git a/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java b/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java index c1d5c5796246cbcf97ea26ceb0b526ecd21e5843..b488e762f9aecdd6f5be4bf4fab90534b8b56f9a 100644 --- a/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java +++ b/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java @@ -37,11 +37,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build JavaVM - * @build LeaseCheckInterval - * @build LeaseCheckInterval_Stub - * @build SelfTerminator + * @build TestLibrary JavaVM LeaseCheckInterval_Stub SelfTerminator * @run main/othervm LeaseCheckInterval */ diff --git a/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java b/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java index 8170168d9d8090bd694b2549cccc31ef569a7249..0ae059b95b2a4afa8b62789d0b3da7917c3286bb 100644 --- a/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java +++ b/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java @@ -30,8 +30,6 @@ * invoked. * @author Peter Jones * - * @library ../../../testlibrary - * @build MarshalledObjectGet * @build MarshalledObjectGet_Stub * @run main/othervm/timeout=120 MarshalledObjectGet */ diff --git a/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java b/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java index eb9d19287730ee74cbe16d49100ca1ba99b70d21..05be7aed087a6b19e391b830ef54b6b4c4e8c1c9 100644 --- a/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java +++ b/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java @@ -39,9 +39,7 @@ * @author Laird Dornin * * @library ../../../testlibrary - * @build UnreferencedContext - * @build UnreferencedContext_Stub - * @build TestLibrary + * @build TestLibrary UnreferencedContext_Stub * @run main/othervm/timeout=120 UnreferencedContext */ diff --git a/test/java/rmi/server/clientStackTrace/ClientStackTrace.java b/test/java/rmi/server/clientStackTrace/ClientStackTrace.java index 41a2103be30063aaf05d941704305dee74b690d8..d68555759420e2a555e6b60afc7c6a350b0b28c3 100644 --- a/test/java/rmi/server/clientStackTrace/ClientStackTrace.java +++ b/test/java/rmi/server/clientStackTrace/ClientStackTrace.java @@ -28,7 +28,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build ClientStackTrace MyRemoteObject_Stub TestLibrary TestParams + * @build TestLibrary ClientStackTrace MyRemoteObject_Stub * @run main/othervm/policy=security.policy/timeout=120 ClientStackTrace */ diff --git a/test/java/rmi/server/getRemoteClass/GetRemoteClass.java b/test/java/rmi/server/getRemoteClass/GetRemoteClass.java index 8fa471006cc4387ab6c845b7caa8a95d1fdf5d68..b6f21b46ef5f42cb8ad4af9fdd7db4c07ba29365 100644 --- a/test/java/rmi/server/getRemoteClass/GetRemoteClass.java +++ b/test/java/rmi/server/getRemoteClass/GetRemoteClass.java @@ -28,7 +28,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build GetRemoteClass TestLibrary TestParams + * @build TestLibrary * @run main/othervm GetRemoteClass */ diff --git a/test/java/rmi/server/serverStackTrace/ServerStackTrace.java b/test/java/rmi/server/serverStackTrace/ServerStackTrace.java index 6cc9b2da119b71f176d0bdd40594d8207007c991..43504affe283d214f33b65c867408e0e23eb4ff7 100644 --- a/test/java/rmi/server/serverStackTrace/ServerStackTrace.java +++ b/test/java/rmi/server/serverStackTrace/ServerStackTrace.java @@ -29,8 +29,7 @@ * serialized with the Throwable from the server. * @author Peter Jones * - * @build ServerStackTrace - * @build ServerStackTrace_Stub + * @build ServerStackTrace ServerStackTrace_Stub * @run main/othervm ServerStackTrace */ diff --git a/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java b/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java index 243d3223f0a4b72ef251fb71c645a348fc7e09ee..9606d12f9d8a2b302c52e7bfd48c1fd43fd85f4c 100644 --- a/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java +++ b/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java @@ -36,10 +36,7 @@ * for reasons of performance or confidentiality requirements. * @author Peter Jones * - * @build SuppressStackTraces - * @build Impl2_Stub - * @build Impl1_Stub - * @build Impl1_Skel + * @build SuppressStackTraces Impl2_Stub Impl1_Stub Impl1_Skel * @run main/othervm SuppressStackTraces */ diff --git a/test/java/rmi/server/useCustomRef/UseCustomRef.java b/test/java/rmi/server/useCustomRef/UseCustomRef.java index 059c9a849c3db6aaa3283353f34ba3e09080658e..23d784706ca41bfbac1df2e74f54a1b13afe60ea 100644 --- a/test/java/rmi/server/useCustomRef/UseCustomRef.java +++ b/test/java/rmi/server/useCustomRef/UseCustomRef.java @@ -31,11 +31,7 @@ * 4180392 * * @library ../../testlibrary - * @build UseCustomRef - * @build Ping - * @build UseCustomRef_Stub - * @build UseCustomRef_Skel - * @build TestLibrary + * @build TestLibrary Ping UseCustomRef_Stub UseCustomRef_Skel * @run main/othervm/policy=security.policy/secure=java.rmi.RMISecurityManager/timeout=120 UseCustomRef * * This test was failing to run because the synthetic access diff --git a/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java b/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java index a2361373644d3bd8f30583c9ed6f1839a1fc7da3..b4d86c4ccd22e566a954b69d844cd096f9629376 100644 --- a/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java +++ b/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java @@ -31,7 +31,6 @@ * exception for which it doesn't even consult the RMIFailureHandler. * @author Peter Jones * - * @build CloseServerSocketOnTermination * @run main/othervm CloseServerSocketOnTermination */ diff --git a/test/java/rmi/transport/checkFQDN/CheckFQDN.java b/test/java/rmi/transport/checkFQDN/CheckFQDN.java index 006de5b6c89544e88d89b7cccc6957a9d9cdff23..9660f532c39905179d9b1ea4246b0f36bc846a45 100644 --- a/test/java/rmi/transport/checkFQDN/CheckFQDN.java +++ b/test/java/rmi/transport/checkFQDN/CheckFQDN.java @@ -33,8 +33,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build CheckFQDN CheckFQDNClient CheckFQDN_Stub TellServerName - * @build TestLibrary + * @build TestLibrary CheckFQDNClient CheckFQDN_Stub TellServerName * @run main/othervm/timeout=120 CheckFQDN */ diff --git a/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java b/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java index 0ab00577dc83fca54722397938b484af17d180b8..52fd7df9295d86d64d5be82f868b444e711da28a 100644 --- a/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java +++ b/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java @@ -28,8 +28,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build CheckLeaseLeak CheckLeaseLeak_Stub LeaseLeakClient LeaseLeak - * @build TestLibrary + * @build TestLibrary CheckLeaseLeak_Stub LeaseLeakClient LeaseLeak * @run main/othervm/timeout=240 CheckLeaseLeak * */ diff --git a/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java b/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java index 69c51de80744ab7f23f2026004a3f43126ffdfda..2b1f1eeba992a42aa2b4daecb8263367eceab03d 100644 --- a/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java +++ b/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java @@ -31,7 +31,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build CloseServerSocket TestLibrary + * @build TestLibrary * @run main/othervm CloseServerSocket */ diff --git a/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java b/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java index 97ad31dc99db23429fb1485acda4b74c6581db20..bcd58a0a6a5a5218d700db69a63230e4b5ce5ecf 100644 --- a/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java +++ b/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java @@ -28,11 +28,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build DGCDeadLock - * @build Test - * @build TestImpl - * @build TestImpl_Stub - * @build TestLibrary + * @build TestLibrary Test TestImpl TestImpl_Stub * @run main/othervm/policy=security.policy/timeout=360 DGCDeadLock */ diff --git a/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java b/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java index df04070f138b1a4840865da2dd20ba2cbc50fda7..ed1ba8e0715479100c487d79819f6b13eb5ed958 100644 --- a/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java +++ b/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java @@ -31,7 +31,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build HandshakeFailure TestLibrary + * @build TestLibrary * @run main/othervm HandshakeFailure */ diff --git a/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java b/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java index 304c175772bac2c4418981dcaa22c9bf3513aee8..ba492f4194dea73ef7186edd85b5671af31fa591 100644 --- a/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java +++ b/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java @@ -34,7 +34,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build HandshakeTimeout TestLibrary + * @build TestLibrary * @run main/othervm HandshakeTimeout */ diff --git a/test/java/rmi/transport/httpSocket/HttpSocketTest.java b/test/java/rmi/transport/httpSocket/HttpSocketTest.java index 1004bfb86ed5a620e31d42876f655d163736bad1..032c4cdc532172cf5738df835a88603efa608665 100644 --- a/test/java/rmi/transport/httpSocket/HttpSocketTest.java +++ b/test/java/rmi/transport/httpSocket/HttpSocketTest.java @@ -27,7 +27,7 @@ * @author Dana Burns * * @library ../../testlibrary - * @build HttpSocketTest HttpSocketTest_Stub TestLibrary + * @build TestLibrary HttpSocketTest HttpSocketTest_Stub * @run main/othervm/policy=security.policy HttpSocketTest */ diff --git a/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java b/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java index 5b21da8680a44377c38a413d43eafda7b436dbab..4080bfa7e74b5d13ed445918fbc798fa8d70d303 100644 --- a/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java +++ b/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java @@ -32,7 +32,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build TestLibrary RapidExportUnexport + * @build TestLibrary * @run main/othervm RapidExportUnexport */ diff --git a/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java b/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java index f72fea3164a03e2e951f35d651c7c35e0d64cef4..3a0bfa1cafa1ec7f7cc97ec0e8b8ced7000818fc 100644 --- a/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java +++ b/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java @@ -27,12 +27,9 @@ * @summary Incoming connections should be subject to timeout * @author Adrian Colley * - * @library ../../testlibrary - * @build TestIface - * @build TestImpl - * @build TestImpl_Stub - * @build ReadTimeoutTest - * @run main/othervm/policy=security.policy/timeout=60 -Dsun.rmi.transport.tcp.readTimeout=5000 ReadTimeoutTest + * @build TestIface TestImpl TestImpl_Stub + * @run main/othervm/policy=security.policy/timeout=60 + * -Dsun.rmi.transport.tcp.readTimeout=5000 ReadTimeoutTest */ /* This test sets a very short read timeout, exports an object, and then diff --git a/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java b/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java index decec588d01b17f2a378c7d3393041c5cb61ede1..e5e7d80b49f5b89012b3b375da912ef23af4df73 100644 --- a/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java +++ b/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java @@ -34,7 +34,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build ReuseDefaultPort TestLibrary + * @build TestLibrary * @run main/othervm ReuseDefaultPort */ diff --git a/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java b/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java index 04a931daf9b3657bb64f34ac5b20c663d54ffc06..ac480776229ab18e70a99cc35efe46d47175aa78 100644 --- a/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java +++ b/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java @@ -38,7 +38,6 @@ * subsystems also not holding on to the loader in their daemon threads.] * @author Peter Jones * - * @build RuntimeThreadInheritanceLeak * @build RuntimeThreadInheritanceLeak_Stub * @run main/othervm RuntimeThreadInheritanceLeak */ diff --git a/test/javax/rmi/ssl/SocketFactoryTest.java b/test/javax/rmi/ssl/SocketFactoryTest.java index cf88fd746a088baa7aba1b19c06a61d60cf73048..76bf51a1c77c927345cac929c737df4dea8edd33 100644 --- a/test/javax/rmi/ssl/SocketFactoryTest.java +++ b/test/javax/rmi/ssl/SocketFactoryTest.java @@ -26,8 +26,7 @@ * @bug 4932837 6582235 * @summary Test SslRMI[Client|Server]SocketFactory equals() and hashCode(). * @author Daniel Fuchs - * @run clean SocketFactoryTest - * @run build SocketFactoryTest + * * @run main SocketFactoryTest */ diff --git a/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java b/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java index 04d2fd9fe0311e0491981847f17bc404c36ae38a..012c0b8cab91b19d8bcd451438fc4ea17a15f301 100644 --- a/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java +++ b/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java @@ -22,8 +22,10 @@ */ /* @test - @bug 4094889 - @summary rmid can have a corrupted log + * @bug 4094889 + * @summary rmid can have a corrupted log + * + * @run main LogAlignmentTest */ /* Fault: ReliableLog used RandomAccessFile.skipBytes() to seek past the end diff --git a/test/sun/rmi/log/ReliableLog/SnapshotSize.java b/test/sun/rmi/log/ReliableLog/SnapshotSize.java index f1febfc1fc2415b312f4152ec794482ddc288b89..592ef5eaba9658614bf0bfa50d96d20b87a7c66a 100644 --- a/test/sun/rmi/log/ReliableLog/SnapshotSize.java +++ b/test/sun/rmi/log/ReliableLog/SnapshotSize.java @@ -25,6 +25,8 @@ * @bug 4319866 * @summary Verify that ReliableLog.snapshotSize() returns correct snapshot * file size even if LogHandler doesn't flush. + * + * @run main SnapshotSize */ import java.io.ByteArrayOutputStream; diff --git a/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java b/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java index ad2484168eabab6d485d42010b21d51fc8a46fc9..5f4587ecdfb5401ccd92d1b9a0e750ea65b3d20c 100644 --- a/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java +++ b/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java @@ -28,7 +28,6 @@ * @library ../../../../java/rmi/testlibrary * * @build StreamPipe - * @build RmicDefault * @run main RmicDefault */ diff --git a/test/sun/rmi/rmic/newrmic/equivalence/run.sh b/test/sun/rmi/rmic/newrmic/equivalence/run.sh index 8d4f419d346bd2ec541322605dbc7f08930b8f55..27c86041414d8e0dda8a114ba0db1becaccd2c9d 100644 --- a/test/sun/rmi/rmic/newrmic/equivalence/run.sh +++ b/test/sun/rmi/rmic/newrmic/equivalence/run.sh @@ -26,22 +26,24 @@ # @summary This test verifies that the new implementation of rmic # generates equivalent classes as the old implementation, for a set # of sample input classes. +# @author Peter Jones +# # @library ../../../../../java/rmi/testlibrary +# # @build TestLibrary -# @author Peter Jones +# AgentServerImpl +# AppleImpl +# AppleUserImpl +# ComputeServerImpl +# CountServerImpl +# DayTimeServerImpl +# G1Impl +# MyObjectImpl +# NotActivatableServerImpl +# OrangeEchoImpl +# OrangeImpl +# ServerImpl # -# @build AgentServerImpl -# @build AppleImpl -# @build AppleUserImpl -# @build ComputeServerImpl -# @build CountServerImpl -# @build DayTimeServerImpl -# @build G1Impl -# @build MyObjectImpl -# @build NotActivatableServerImpl -# @build OrangeEchoImpl -# @build OrangeImpl -# @build ServerImpl # @run shell run.sh if [ "${TESTJAVA}" = "" ] diff --git a/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java b/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java index e5e19fe12dd50a3b1bbf41e3c15d57b17f6cb115..afcc13571e54147c73d50a16d4ff6b00d49fc232 100644 --- a/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java +++ b/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java @@ -31,8 +31,7 @@ * @author Peter Jones * * @library ../../../../../java/rmi/testlibrary - * @build JavaVM - * @build NoConsoleOutput + * @build TestLibrary JavaVM * @run main/othervm NoConsoleOutput */ diff --git a/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java b/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java index 34cfc485d1eb739b198ea3271d782b87af4af119..1e959536c228ba1e3566e6cd133e688f9d7b9a2b 100644 --- a/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java +++ b/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java @@ -28,11 +28,7 @@ * @author Laird Dornin * * @library ../../../../../java/rmi/testlibrary - * @build TestLibrary - * @build TestParams - * @build TestFailedException - * @build CheckLogging - * @build CheckLogStreams + * @build TestLibrary CheckLogging * @run main/othervm -Dsun.rmi.log.useOld=true CheckLogStreams */ diff --git a/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java b/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java index 77c236d437112f6fc482e6d93dae0406f9e37caf..347725a3d6d56285bec0cd8141395067101b96ea 100644 --- a/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java +++ b/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java @@ -29,9 +29,6 @@ * * @library ../../../../../java/rmi/testlibrary * @build TestLibrary - * @build TestParams - * @build TestFailedException - * @build CheckLogging * @run main/othervm CheckLogging */ diff --git a/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java b/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java index 165dfbe1cf9b6ef96ca5cfe0ecc343a0c6ceb5da..bf1eb11372fbab0de18c1afddf9c114026b093ff 100644 --- a/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java +++ b/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java @@ -31,11 +31,7 @@ * @author Ann Wollrath * * @library ../../../../../java/rmi/testlibrary - * @build TestLibrary - * @build TestFailedException - * @build MarshalForeignStub - * @build Receiver - * @build MarshalForeignStub_Stub + * @build TestLibrary Receiver MarshalForeignStub_Stub * @run main/othervm/policy=security.policy MarshalForeignStub */ diff --git a/test/sun/rmi/transport/proxy/EagerHttpFallback.java b/test/sun/rmi/transport/proxy/EagerHttpFallback.java index 1f54e2cb845883bfc4aeb51f8a657a3b6a11bb32..3879c665d14d1c0b28e43d157568f0b427b895af 100644 --- a/test/sun/rmi/transport/proxy/EagerHttpFallback.java +++ b/test/sun/rmi/transport/proxy/EagerHttpFallback.java @@ -25,6 +25,7 @@ * @bug 4290727 * @summary Verify that ConnectException will trigger HTTP fallback if * sun.rmi.transport.proxy.eagerHttpFallback system property is set. + * * @library ../../../../java/rmi/testlibrary * @build TestLibrary * @run main/othervm EagerHttpFallback diff --git a/test/sun/rmi/transport/tcp/DeadCachedConnection.java b/test/sun/rmi/transport/tcp/DeadCachedConnection.java index 1372b03feab8bf05a516b6d36680158e815ae211..7bcd5a71024e50da1bdd9f8ac1583ed6d564c43e 100644 --- a/test/sun/rmi/transport/tcp/DeadCachedConnection.java +++ b/test/sun/rmi/transport/tcp/DeadCachedConnection.java @@ -25,9 +25,7 @@ * @bug 4094891 * @summary unable to retry call if cached connection to server is used * @library ../../../../java/rmi/testlibrary - * @build DeadCachedConnection - * @build JavaVM - * @build TestLibrary + * @build TestLibrary JavaVM * @run main/othervm DeadCachedConnection */ diff --git a/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java b/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java index af41bf0a7af4243399143d3439a375707a83c05c..1624f68ee8cb59c5a6c29c110bd3132984b26029 100644 --- a/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java +++ b/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java @@ -27,11 +27,8 @@ * @summary RMI blocks in HttpAwareServerSocket.accept() if you telnet to it * @author Adrian Colley * - * @library ../../../../../java/rmi/testlibrary/ - * @build TestIface - * @build TestImpl - * @build TestImpl_Stub - * @build BlockAcceptTest + * @library ../../../../../java/rmi/testlibrary + * @build TestIface TestImpl TestImpl_Stub * @run main/othervm/policy=security.policy/timeout=60 BlockAcceptTest */ diff --git a/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java b/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java index 51dbeec1060e80e68e827cb9f7b4d01a51b85f3f..805c798ae4588c4a946974f8018fd520a5d1f98a 100644 --- a/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java +++ b/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java @@ -28,7 +28,6 @@ * on that port, rather than engage in the deprecated "multiplexing protocol". * @author Peter Jones * - * @build DisableMultiplexing * @build DisableMultiplexing_Stub * @run main/othervm DisableMultiplexing */