OpenJDK / jigsaw / jake / jdk
changeset 14297:1b632228f7e5
Jake patch for 8140336: Add @modules for exported dependencies to jdk_core tests
Reviewed-by: alanb, mchung
line wrap: on
line diff
--- a/test/java/lang/Class/GetModuleTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/java/lang/Class/GetModuleTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -25,6 +25,7 @@ * @test * @summary Exercise Class#getModule * @modules java.base/jdk.internal.org.objectweb.asm + java.desktop * @run testng GetModuleTest */
--- a/test/java/lang/Package/annotation/PackageInfoTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/java/lang/Package/annotation/PackageInfoTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -25,6 +25,12 @@ * @test * @summary Basic test of package-info in named module and duplicate * package-info in unnamed module + * @modules java.compiler + * java.desktop + * java.management + * jdk.attach + * jdk.jdi + * jdk.xml.dom * @compile package-info.java PackageInfoTest.java * @run testng p.PackageInfoTest */
--- a/test/jdk/jigsaw/etc/resources/ResourcesTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/etc/resources/ResourcesTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -33,6 +33,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build ResourcesTest CompilerUtils jdk.testlibrary.* * @run testng ResourcesTest * @summary Driver for basic test of resource encapsulation
--- a/test/jdk/jigsaw/invoke/access/ModuleAccessControlTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/invoke/access/ModuleAccessControlTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -35,6 +35,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build CompilerUtils jdk.testlibrary.* * @run testng ModuleAccessControlTest * @summary Driver for testing module access checking by MethodHandles.Lookup
--- a/test/jdk/jigsaw/launcher/addexports/AddExportsTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/launcher/addexports/AddExportsTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -24,6 +24,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build AddExportsTest CompilerUtils jdk.testlibrary.* * @run testng AddExportsTest * @summary Basic tests for java -XaddExports
--- a/test/jdk/jigsaw/launcher/addmods/AddModsTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/launcher/addmods/AddModsTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -25,6 +25,7 @@ * @test * @library ../../lib /lib/testlibrary * @modules jdk.jlink/jdk.tools.jmod + * jdk.compiler * @build AddModsTest CompilerUtils jdk.testlibrary.* * @run testng AddModsTest * @summary Basic test for java -addmods
--- a/test/jdk/jigsaw/launcher/addreads/AddReadsTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/launcher/addreads/AddReadsTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -24,6 +24,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build AddReadsTest CompilerUtils jdk.testlibrary.* * @run testng AddReadsTest * @summary Basic tests for java -XaddReads
--- a/test/jdk/jigsaw/launcher/basic/BasicTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/launcher/basic/BasicTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -26,6 +26,7 @@ * @library ../../lib /lib/testlibrary * @modules jdk.jartool/sun.tools.jar * jdk.jlink/jdk.tools.jmod + * jdk.compiler * @build BasicTest CompilerUtils jdk.testlibrary.* * @run testng BasicTest * @summary Basic test of starting an application as a module
--- a/test/jdk/jigsaw/launcher/limitmods/LimitModsTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/launcher/limitmods/LimitModsTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -24,6 +24,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build LimitModsTest CompilerUtils jdk.testlibrary.* * @run testng LimitModsTest * @summary Basic tests for java -limitmods
--- a/test/jdk/jigsaw/launcher/patch/PatchTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/launcher/patch/PatchTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -24,6 +24,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build PatchTest CompilerUtils jdk.testlibrary.* * @run testng PatchTest * @summary Basic test for -Xpatch
--- a/test/jdk/jigsaw/launcher/upgrademodulepath/UpgradeModulePathTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/launcher/upgrademodulepath/UpgradeModulePathTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -24,6 +24,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build UpgradeModulePathTest CompilerUtils jdk.testlibrary.* * @run testng UpgradeModulePathTest * @summary Basic test for java -upgrademodulepath
--- a/test/jdk/jigsaw/module/ModuleReader/ModuleReaderTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/module/ModuleReader/ModuleReaderTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -26,6 +26,7 @@ * @library ../../lib * @modules java.base/jdk.internal.module * jdk.jlink/jdk.tools.jmod + * jdk.compiler * @build ModuleReaderTest CompilerUtils JarUtils * @run testng ModuleReaderTest * @summary Basic tests for java.lang.module.ModuleReader
--- a/test/jdk/jigsaw/reflect/Module/BasicModuleTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/reflect/Module/BasicModuleTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -34,6 +34,7 @@ /* * @test * @summary Basic test of java.lang.reflect.Module + * @modules java.desktop java.xml * @run testng BasicModuleTest */
--- a/test/jdk/jigsaw/reflect/Module/access/AccessTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/reflect/Module/access/AccessTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -35,6 +35,7 @@ /** * @test * @library ../../../lib /lib/testlibrary + * @modules java.compiler * @build AccessTest CompilerUtils jdk.testlibrary.* * @run testng AccessTest * @summary Driver for test that checks access to public members in exported
--- a/test/jdk/jigsaw/reflect/Proxy/ProxyClassAccessTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/reflect/Proxy/ProxyClassAccessTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -36,6 +36,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build ProxyClassAccessTest CompilerUtils jdk.testlibrary.* * @run testng ProxyClassAccessTest * @summary Driver for testing proxy class doesn't have access to
--- a/test/jdk/jigsaw/reflect/Proxy/ProxyLayerTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/reflect/Proxy/ProxyLayerTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -42,6 +42,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build ProxyTest CompilerUtils jdk.testlibrary.ProcessTools * @run testng ProxyLayerTest * @summary Test proxies to implement interfaces in a layer
--- a/test/jdk/jigsaw/reflect/Proxy/ProxyTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/reflect/Proxy/ProxyTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -35,6 +35,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build ProxyTest q.U CompilerUtils jdk.testlibrary.* * @run testng ProxyTest * @summary Driver for testing proxies accessing interfaces in named modules
--- a/test/jdk/jigsaw/scenarios/automaticmodules/RunWithAutomaticModules.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/scenarios/automaticmodules/RunWithAutomaticModules.java Tue Oct 27 20:12:15 2015 -0700 @@ -24,6 +24,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build RunWithAutomaticModules CompilerUtils JarUtils * jdk.testlibrary.ProcessTools * @run testng RunWithAutomaticModules @@ -176,4 +177,4 @@ } -} \ No newline at end of file +}
--- a/test/jdk/jigsaw/scenarios/container/ContainerTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/scenarios/container/ContainerTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -25,6 +25,7 @@ * @test * @library ../../lib /lib/testlibrary * @modules jdk.jartool/sun.tools.jar + * jdk.compiler * @build ContainerTest CompilerUtils jdk.testlibrary.* * @run testng ContainerTest * @summary Starts a simple container that uses dynamic configurations
--- a/test/jdk/jigsaw/scenarios/overlappingpackages/OverlappingPackagesTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/scenarios/overlappingpackages/OverlappingPackagesTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -24,6 +24,7 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules jdk.compiler * @build OverlappingPackagesTest CompilerUtils jdk.testlibrary.* * @run testng OverlappingPackagesTest * @summary Basic test to ensure that startup fails if two or more modules
--- a/test/jdk/jigsaw/tools/jimage/JImageTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jimage/JImageTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -52,6 +52,7 @@ * jdk.jlink/jdk.tools.jlink * jdk.jlink/jdk.tools.jimage * jdk.jlink/jdk.tools.jlink.internal + * jdk.compiler * @run build JImageTest * @run build tests.* * @run main/othervm -verbose:gc -Xmx1g JImageTest
--- a/test/jdk/jigsaw/tools/jlink/CustomImageBuilderTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/CustomImageBuilderTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -33,6 +33,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run testng/othervm CustomImageBuilderTest */
--- a/test/jdk/jigsaw/tools/jlink/CustomPluginTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/CustomPluginTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -45,6 +45,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main/othervm CustomPluginTest */
--- a/test/jdk/jigsaw/tools/jlink/DefaultProviderTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/DefaultProviderTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -44,6 +44,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main/othervm DefaultProviderTest */
--- a/test/jdk/jigsaw/tools/jlink/IntegrationTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/IntegrationTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -62,6 +62,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main IntegrationTest */
--- a/test/jdk/jigsaw/tools/jlink/JLink2Test.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/JLink2Test.java Tue Oct 27 20:12:15 2015 -0700 @@ -32,6 +32,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main/othervm -verbose:gc -Xmx1g JLink2Test */
--- a/test/jdk/jigsaw/tools/jlink/JLinkNegativeTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/JLinkNegativeTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -34,6 +34,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run testng JLinkNegativeTest */
--- a/test/jdk/jigsaw/tools/jlink/JLinkOptimTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/JLinkOptimTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -83,6 +83,7 @@ * java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.org.objectweb.asm.tree * java.base/jdk.internal.org.objectweb.asm.util + * jdk.compiler * @build tests.* * @run main JLinkOptimTest */
--- a/test/jdk/jigsaw/tools/jlink/JLinkOptionsTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/JLinkOptionsTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -39,6 +39,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main JLinkOptionsTest */
--- a/test/jdk/jigsaw/tools/jlink/JLinkPluginsTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/JLinkPluginsTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -42,6 +42,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main/othervm -verbose:gc -Xmx1g JLinkPluginsTest */
--- a/test/jdk/jigsaw/tools/jlink/JLinkPostProcessingTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/JLinkPostProcessingTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -50,6 +50,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main/othervm JLinkPostProcessingTest */
--- a/test/jdk/jigsaw/tools/jlink/JLinkTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/JLinkTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -51,6 +51,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main/othervm -verbose:gc -Xmx1g JLinkTest */
--- a/test/jdk/jigsaw/tools/jlink/NativeTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/NativeTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -32,6 +32,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main NativeTest */
--- a/test/jdk/jigsaw/tools/jlink/basic/BasicTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/basic/BasicTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -29,6 +29,7 @@ * @modules java.base/jdk.internal.module * jdk.jlink/jdk.tools.jlink * jdk.jlink/jdk.tools.jmod + * jdk.compiler * @build jdk.testlibrary.ProcessTools * jdk.testlibrary.OutputAnalyzer * JarUtils CompilerUtils
--- a/test/jdk/jigsaw/tools/jlink/hashes/HashesTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/hashes/HashesTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -29,6 +29,7 @@ * @modules java.base/jdk.internal.module * jdk.jlink/jdk.tools.jlink * jdk.jlink/jdk.tools.jmod + * jdk.compiler * @ignore * @build jdk.testlibrary.ProcessTools jdk.testlibrary.OutputAnalyzer CompilerUtils * @run main HashesTest
--- a/test/jdk/jigsaw/tools/jlink/plugins/PluginOrderTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/plugins/PluginOrderTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -32,6 +32,7 @@ * jdk.jlink/jdk.tools.jlink.internal * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main/othervm PluginOrderTest */
--- a/test/jdk/jigsaw/tools/jlink/plugins/StringSharingPluginTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/plugins/StringSharingPluginTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -34,6 +34,7 @@ * jdk.jlink/jdk.tools.jmod * jdk.jlink/jdk.tools.jimage * jdk.jdeps/com.sun.tools.classfile + * jdk.compiler * @run build tests.* * @run main StringSharingPluginTest */
--- a/test/jdk/jigsaw/tools/jlink/plugins/StripDebugPluginTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jlink/plugins/StripDebugPluginTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -34,6 +34,7 @@ * jdk.jlink/jdk.tools.jimage * jdk.jlink/jdk.tools.jmod * jdk.jdeps/com.sun.tools.classfile + * jdk.compiler * @run main StripDebugPluginTest */
--- a/test/jdk/jigsaw/tools/jmod/JmodNegativeTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jmod/JmodNegativeTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -23,8 +23,9 @@ /* * @test + * @library /lib/testlibrary /jdk/jigsaw/lib * @modules jdk.jlink/jdk.tools.jmod - * @library /lib/testlibrary /jdk/jigsaw/lib + * jdk.compiler * @build jdk.testlibrary.FileUtils CompilerUtils * @run testng JmodNegativeTest * @summary Negative tests for jmod @@ -548,4 +549,4 @@ JmodResult assertFailure() { assertTrue(exitCode != 0, output); return this; } JmodResult resultChecker(Consumer<JmodResult> r) { r.accept(this); return this; } } -} \ No newline at end of file +}
--- a/test/jdk/jigsaw/tools/jmod/JmodTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/tools/jmod/JmodTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -23,8 +23,9 @@ /* * @test + * @library /jdk/jigsaw/lib /lib/testlibrary * @modules jdk.jlink/jdk.tools.jmod - * @library /jdk/jigsaw/lib /lib/testlibrary + * jdk.compiler * @build jdk.testlibrary.FileUtils CompilerUtils * @run testng JmodTest * @summary Basic test for jmod
--- a/test/jdk/jigsaw/util/ServiceLoader/ServicesTest.java Mon Oct 26 17:56:32 2015 -0700 +++ b/test/jdk/jigsaw/util/ServiceLoader/ServicesTest.java Tue Oct 27 20:12:15 2015 -0700 @@ -40,6 +40,8 @@ /** * @test * @library ../../lib /lib/testlibrary + * @modules java.scripting + jdk.compiler * @build ServicesTest CompilerUtils jdk.testlibrary.* * @run testng ServicesTest * @summary Tests ServiceLoader to locate service providers on the module path