8140336: Add @modules for exported dependencies to jdk_core tests

Reviewed-by: alanb, mchung
This commit is contained in:
Alexandre Iline 2015-10-27 20:06:02 -07:00
parent 1b3ee82ffc
commit 9cbe14b4df
62 changed files with 24 additions and 55 deletions

View File

@ -1,4 +1,4 @@
# ProcessHandle tests use TestNG
TestNG.dirs = .
lib.dirs = /lib/testlibrary
modules = jdk.management

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,7 @@
* @test
* @bug 7122142
* @summary Test deadlock situation when recursive annotations are parsed
* @modules java.management
*/
import java.lang.annotation.Retention;

View File

@ -27,7 +27,6 @@
* @summary confirms that added transformers all really run
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build AddTransformerTest ATransformerManagementTestCase
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar AddTransformerTest AddTransformerTest

View File

@ -27,7 +27,6 @@
* @summary simple test for the Boot-Class-Path manifest attribute
* @author Gabriel Adauto, Wily Technology, Robert Field, Sun Microsystems
*
* @modules java.instrument
* @run build AppendToBootstrapClassPathTest ExampleForBootClassPath
* @run shell AppendToBootstrapClassPathSetUp.sh
* @run shell MakeJAR.sh bootclasspathAgent

View File

@ -27,7 +27,6 @@
* @summary simple test for the Class-Path manifest attribute
* @author Gabriel Adauto, Wily Technology; Robert Field, Sun Microsystems
*
* @modules java.instrument
* @run build AppendToClassPathTest
* @run shell AppendToClassPathSetUp.sh
* @run shell MakeJAR.sh classpathAgent

View File

@ -27,7 +27,6 @@
# attribute.
#
# @key intermittent
# @modules java.instrument
# @run shell/timeout=240 BootClassPathTest.sh
if [ "${TESTJAVA}" = "" ]

View File

@ -26,7 +26,6 @@
* @bug 5050487
* @summary Check that Instrumentation methods can execute from a runtime
* shutdown hook
* @modules java.instrument
* @run build FromShutdownHook
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar FromShutdownHook FromShutdownHook

View File

@ -27,7 +27,6 @@
* @summary simple tests for getAllLoadedClasses (is Object there? does a newly loaded class show up?)
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build GetAllLoadedClassesTest DummyClass
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar GetAllLoadedClassesTest GetAllLoadedClassesTest

View File

@ -27,7 +27,6 @@
* @summary simple tests for getInitiatedClasses (does a newly loaded class show up?)
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build GetInitiatedClassesTest DummyClass
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar GetInitiatedClassesTest GetInitiatedClassesTest

View File

@ -27,7 +27,6 @@
* @summary round-trip test for getObjectSize (does it return, and is the result non-zero?)
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build GetObjectSizeTest
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar GetObjectSizeTest GetObjectSizeTest

View File

@ -27,7 +27,6 @@
* @summary test isModifiableClass
* @author Robert Field, Sun Microsystems
*
* @modules java.instrument
* @run build IsModifiableClassApp IsModifiableClassAgent
* @run shell MakeJAR3.sh IsModifiableClassAgent 'Can-Retransform-Classes: true'
* @run main/othervm -javaagent:IsModifiableClassAgent.jar IsModifiableClassApp

View File

@ -27,7 +27,6 @@
# @author Daniel D. Daugherty
#
# @key intermittent
# @modules java.instrument
# @run build ManifestTestApp ExampleForBootClassPath
# @run shell/timeout=900 ManifestTest.sh
#

View File

@ -28,6 +28,8 @@
* @author Robert Field, Sun Microsystems
*
* @modules java.base/jdk.internal.org.objectweb.asm
* java.management
* java.instrument
* @run shell/timeout=240 MakeJAR2.sh NativeMethodPrefixAgent NativeMethodPrefixApp 'Can-Retransform-Classes: true' 'Can-Set-Native-Method-Prefix: true'
* @run main/othervm -javaagent:NativeMethodPrefixAgent.jar NativeMethodPrefixApp
*/

View File

@ -27,7 +27,6 @@
* @summary make sure no transformers run when none are registered
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build NoTransformerAddedTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar NoTransformerAddedTest NoTransformerAddedTest

View File

@ -27,7 +27,6 @@
* @summary make sure getObjectSize(null) throws NullPointerException.
* @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build NullGetObjectSizeTest
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar NullGetObjectSizeTest NullGetObjectSizeTest

View File

@ -27,7 +27,6 @@
* @summary make sure redefineClasses throws NullPointerException in the right places.
* @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build NullRedefineClassesTests
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar NullRedefineClassesTests NullRedefineClassesTests

View File

@ -27,7 +27,6 @@
* @summary make sure addTransformer(null) throws what it should
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build NullTransformerAddTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar NullTransformerAddTest NullTransformerAddTest

View File

@ -27,7 +27,6 @@
* @summary make sure removeTransformer(null) throws NullPointerException
* @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build NullTransformerRemoveTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar NullTransformerRemoveTest NullTransformerRemoveTest

View File

@ -26,7 +26,6 @@
# @summary Test parallel class loading by parallel transformers.
# @author Daniel D. Daugherty as modified from the code of Daryl Puryear @ Wily
#
# @modules java.instrument
# @run shell MakeJAR3.sh ParallelTransformerLoaderAgent
# @run build ParallelTransformerLoaderApp
# @run shell/timeout=240 ParallelTransformerLoader.sh

View File

@ -27,7 +27,6 @@
* @summary test config (0,0,1,0): declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent0010
* @run main/othervm -javaagent:InheritAgent0010.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (0,0,1,1): declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent0011
* @run main/othervm -javaagent:InheritAgent0011.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (0,1,1,0): inherited 1-arg and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent0110
* @run main/othervm -javaagent:InheritAgent0110.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (0,1,1,1): inherited 1-arg, declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent0111
* @run main/othervm -javaagent:InheritAgent0111.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (1,0,0,0): inherited 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1000
* @run main/othervm -javaagent:InheritAgent1000.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (1,0,0,1): inherited 2-arg, and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1001
* @run main/othervm -javaagent:InheritAgent1001.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (1,0,1,0): inherited 2-arg, and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1010
* @run main/othervm -javaagent:InheritAgent1010.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (1,0,1,1): inherited 2-arg, declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1011
* @run main/othervm -javaagent:InheritAgent1011.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (1,1,0,0): inherited 2-arg and inherited 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1100
* @run main/othervm -javaagent:InheritAgent1100.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (1,1,0,1): inherited 2-arg, inherited 1-arg, and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1101
* @run main/othervm -javaagent:InheritAgent1101.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (1,1,1,0): inherited 2-arg, inherited 1-arg, and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1110
* @run main/othervm -javaagent:InheritAgent1110.jar DummyMain
*/

View File

@ -27,7 +27,6 @@
* @summary test config (1,1,1,1): inherited 2-arg, inherited 1-arg, declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
* @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1111
* @run main/othervm -javaagent:InheritAgent1111.jar DummyMain
*/

View File

@ -28,6 +28,7 @@
#
# @key intermittent
# @modules java.instrument
# java.management
# @run shell MakeJAR3.sh RedefineBigClassAgent 'Can-Redefine-Classes: true'
# @run build BigClass RedefineBigClassApp NMTHelper
# @run shell/timeout=600 RedefineBigClass.sh

View File

@ -26,7 +26,6 @@
# @summary Redefine a class with a native method.
# @author Daniel D. Daugherty as modified from the test submitted by clovis@par.univie.ac.at
#
# @modules java.instrument
# @run shell MakeJAR3.sh RedefineClassWithNativeMethodAgent 'Can-Redefine-Classes: true'
# @run build RedefineClassWithNativeMethodApp
# @run shell RedefineClassWithNativeMethod.sh

View File

@ -27,7 +27,6 @@
* @summary test that redefineClasses and isRedefineClassesSupported behave correctly when redefine is not enabled
* @author Robert Field, Sun Microsystems -- as modified from the work of Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build RedefineClassesDisabledTest
* @run shell RedefineSetUp.sh
* @run shell MakeJAR.sh basicAgent

View File

@ -27,7 +27,6 @@
* @summary insure redefine is supported. exercise a class, then redefine it and do it again
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build RedefineClassesTests
* @run shell RedefineSetUp.sh
* @run shell MakeJAR.sh redefineAgent

View File

@ -26,7 +26,6 @@
# @summary Reflexive invocation of newly added methods broken.
# @author Daniel D. Daugherty
#
# @modules java.instrument
# @run shell MakeJAR3.sh RedefineMethodAddInvokeAgent 'Can-Redefine-Classes: true'
# @run build RedefineMethodAddInvokeApp
# @run shell RedefineMethodAddInvoke.sh

View File

@ -27,7 +27,6 @@
# @author Daniel D. Daugherty
# @author Serguei Spitsyn
#
# @modules java.instrument
# @run shell MakeJAR3.sh RedefineMethodDelInvokeAgent 'Can-Redefine-Classes: true'
# @run build RedefineMethodDelInvokeApp
# @run shell RedefineMethodDelInvoke.sh

View File

@ -27,6 +27,7 @@
# @author Stefan Karlsson
#
# @modules java.instrument
# java.management
# @run shell MakeJAR3.sh RedefineMethodInBacktraceAgent 'Can-Redefine-Classes: true'
# @run build RedefineMethodInBacktraceTarget RedefineMethodInBacktraceApp
# @run shell RedefineMethodInBacktrace.sh

View File

@ -26,7 +26,6 @@
# @summary Method annotations are incorrectly set when redefining classes.
# @author Stefan Karlsson
#
# @modules java.instrument
# @run shell MakeJAR3.sh RedefineMethodWithAnnotationsAgent 'Can-Redefine-Classes: true'
# @run build RedefineMethodWithAnnotationsTarget RedefineMethodWithAnnotationsApp RedefineMethodWithAnnotationsAnnotations
# @run shell RedefineMethodWithAnnotations.sh

View File

@ -28,7 +28,6 @@
# verify that the right methods are called.
# @author Daniel D. Daugherty
#
# @modules java.instrument
# @run shell MakeJAR3.sh RedefineSubclassWithTwoInterfacesAgent 'Can-Redefine-Classes: true'
# @run build RedefineSubclassWithTwoInterfacesApp
# @run shell RedefineSubclassWithTwoInterfaces.sh

View File

@ -27,7 +27,6 @@
* @summary remove an transformer that was never added
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build RemoveAbsentTransformerTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar RemoveAbsentTransformerTest RemoveAbsentTransformerTest

View File

@ -27,7 +27,6 @@
* @summary simple remove of a transformer that was added
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build RemoveTransformerTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar RemoveTransformerTest RemoveTransformerTest

View File

@ -28,6 +28,7 @@
#
# @key intermittent
# @modules java.instrument
# java.management
# @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true'
# @run build BigClass RetransformBigClassApp NMTHelper
# @run shell/timeout=600 RetransformBigClass.sh

View File

@ -27,7 +27,6 @@
* @summary simple test with one transformer (makes sure it gets called)
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build SingleTransformerTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar SingleTransformerTest SingleTransformerTest

View File

@ -26,7 +26,6 @@
# @summary stress getObjectSize() API
# @author Daniel D. Daugherty as modified from the code of fischman@google.com
#
# @modules java.instrument
# @run build StressGetObjectSizeApp
# @run shell MakeJAR.sh basicAgent
# @run shell StressGetObjectSizeTest.sh

View File

@ -0,0 +1 @@
modules = java.instrument

View File

@ -27,7 +27,6 @@
* @summary test transformer add/remove pairs in sequence
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build TransformMethodTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar TransformMethodTest TransformMethodTest

View File

@ -27,7 +27,6 @@
* @summary multi-thread test to exercise sync and contention for adds to transformer registry
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build TransformerManagementThreadAddTests
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadAddTests TransformerManagementThreadAddTests

View File

@ -27,7 +27,6 @@
* @summary multi-thread test to exercise sync and contention for removes to transformer registry
* @author Gabriel Adauto, Wily Technology
*
* @modules java.instrument
* @run build TransformerManagementThreadRemoveTests
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadRemoveTests TransformerManagementThreadRemoveTests

View File

@ -29,7 +29,6 @@
# transform() on a retransform operation.
# @author Daniel D. Daugherty
#
# @modules java.instrument
# @run build VerifyLocalVariableTableOnRetransformTest
# @run compile -g DummyClassWithLVT.java
# @run shell MakeJAR.sh retransformAgent

View File

@ -26,7 +26,6 @@
# @summary Unit tests for appendToBootstrapClassLoaderSearch and
# appendToSystemClasLoaderSearch methods.
#
# @modules java.instrument
# @run shell/timeout=240 CircularityErrorTest.sh
if [ "${TESTSRC}" = "" ]

View File

@ -26,7 +26,6 @@
# @summary Unit tests for appendToBootstrapClassLoaderSearch and
# appendToSystemClasLoaderSearch methods.
#
# @modules java.instrument
# @build ClassUnloadTest
# @run shell ClassUnloadTest.sh

View File

@ -29,7 +29,6 @@
# @summary Unit tests for appendToBootstrapClassLoaderSearch and
# appendToSystemClasLoaderSearch methods.
#
# @modules java.instrument
# @build Agent AgentSupport BootSupport BasicTest PrematureLoadTest DynamicTest
# @run shell/timeout=240 run_tests.sh

View File

@ -28,6 +28,7 @@
* @summary Test verifies that lambda forms are cached when run with multiple threads
* @author kshefov
* @library /lib/testlibrary/jsr292 /lib/testlibrary
* @modules java.management
* @build TestMethods
* @build LambdaFormTestCase
* @build LFCachingTestCase

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,6 +26,7 @@
* @bug 8003881
* @summary tests DoPrivileged action (implemented as lambda expressions) by
* inserting them into the BootClassPath.
* @modules jdk.compiler
* @compile -XDignore.symbol.file LambdaAccessControlDoPrivilegedTest.java LUtils.java
* @run main/othervm LambdaAccessControlDoPrivilegedTest
*/

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,7 @@
* @test
* @bug 8003881
* @summary tests Lambda expression with a a security manager at top level
* @modules jdk.compiler
* @compile -XDignore.symbol.file LambdaAccessControlTest.java LUtils.java
*
* @run main/othervm LambdaAccessControlTest

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it

View File

@ -26,6 +26,7 @@
* @bug 8025636
* @summary Synthetic frames should be hidden in exceptions
* @modules java.base/jdk.internal.org.objectweb.asm
* jdk.compiler
* @compile -XDignore.symbol.file LUtils.java LambdaStackTrace.java
* @run main LambdaStackTrace
*/

View File

@ -3,3 +3,4 @@
TestNG.dirs = .
javatest.maxOutputSize = 250000
modules = jdk.compiler

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,6 +26,8 @@
* @bug 6887710
* @summary Verify the impact of sun.misc.JarIndex.metaInfFilenames on ServiceLoader
* @modules jdk.jartool/sun.tools.jar
* jdk.httpserver
* jdk.compiler
* @run main/othervm Basic
*/

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,7 +26,7 @@
* @bug 7194897
* @summary JSR 292: Cannot create more than 16 instances of an anonymous class
* @modules java.base/sun.misc
* @modules java.management
* java.management
* @library /lib/testlibrary
* @author Robert Field
* @compile -XDignore.symbol.file ManyNewInstanceAnonTest.java

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,7 @@
* @test
* @bug 8003639
* @summary defaultMethod resolution and verification using an URLClassLoader
* @modules jdk.compiler
* @compile -XDignore.symbol.file=true DefaultMethodRegressionTestsRun.java
* @run main DefaultMethodRegressionTestsRun
*/