--- old/test/jdk/jshell/ClassPathTest.java 2016-01-24 14:01:26.000000000 +0000 +++ new/test/jdk/jshell/ClassPathTest.java 2016-01-24 14:01:25.000000000 +0000 @@ -24,6 +24,8 @@ /* * @test * @summary Tests for EvalState#addToClasspath + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib * @build KullaTesting TestingInputStream ToolBox Compiler * @run testng ClassPathTest --- old/test/jdk/jshell/CommandCompletionTest.java 2016-01-24 14:01:27.000000000 +0000 +++ new/test/jdk/jshell/CommandCompletionTest.java 2016-01-24 14:01:26.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8144095 * @summary Test Command Completion + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * jdk.jshell/jdk.internal.jshell.tool * @library /tools/lib * @build ReplToolTesting TestingInputStream Compiler ToolBox * @run testng CommandCompletionTest --- old/test/jdk/jshell/CompletionSuggestionTest.java 2016-01-24 14:01:28.000000000 +0000 +++ new/test/jdk/jshell/CompletionSuggestionTest.java 2016-01-24 14:01:28.000000000 +0000 @@ -25,6 +25,8 @@ * @test * @bug 8141092 * @summary Test Completion + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib * @build KullaTesting TestingInputStream ToolBox Compiler * @run testng CompletionSuggestionTest --- old/test/jdk/jshell/ErrorTranslationTest.java 2016-01-24 14:01:29.000000000 +0000 +++ new/test/jdk/jshell/ErrorTranslationTest.java 2016-01-24 14:01:29.000000000 +0000 @@ -24,6 +24,9 @@ /* * @test * @summary Tests for shell error translation + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * jdk.jshell/jdk.internal.jshell.tool * @library /tools/lib * @build KullaTesting TestingInputStream ExpectedDiagnostic ToolBox Compiler * @run testng ErrorTranslationTest --- old/test/jdk/jshell/HistoryTest.java 2016-01-24 14:01:31.000000000 +0000 +++ new/test/jdk/jshell/HistoryTest.java 2016-01-24 14:01:31.000000000 +0000 @@ -24,6 +24,8 @@ /* * @test * @summary Test Completion + * @modules jdk.jshell/jdk.internal.jshell.tool + * jdk.internal.le/jdk.internal.jline.console.history * @build HistoryTest * @run testng HistoryTest */ --- old/test/jdk/jshell/ImportTest.java 2016-01-24 14:01:33.000000000 +0000 +++ new/test/jdk/jshell/ImportTest.java 2016-01-24 14:01:32.000000000 +0000 @@ -24,6 +24,8 @@ /* * @test * @summary Test imports + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib * @build KullaTesting TestingInputStream ToolBox ExpectedDiagnostic * @run testng ImportTest --- old/test/jdk/jshell/KullaCompletenessStressTest.java 2016-01-24 14:01:34.000000000 +0000 +++ new/test/jdk/jshell/KullaCompletenessStressTest.java 2016-01-24 14:01:34.000000000 +0000 @@ -24,6 +24,7 @@ /* * @test * @summary Test SourceCodeAnalysis + * @modules jdk.compiler/com.sun.tools.javac.api * @build KullaTesting TestingInputStream KullaCompletenessStressTest CompletenessStressTest * @run testng KullaCompletenessStressTest */ --- old/test/jdk/jshell/StartOptionTest.java 2016-01-24 14:01:36.000000000 +0000 +++ new/test/jdk/jshell/StartOptionTest.java 2016-01-24 14:01:35.000000000 +0000 @@ -24,6 +24,9 @@ /* * @test * @summary Testing start-up options. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * jdk.jshell/jdk.internal.jshell.tool * @library /tools/lib * @build Compiler ToolBox * @run testng StartOptionTest --- old/test/jdk/jshell/StopExecutionTest.java 2016-01-24 14:01:37.000000000 +0000 +++ new/test/jdk/jshell/StopExecutionTest.java 2016-01-24 14:01:37.000000000 +0000 @@ -24,6 +24,7 @@ /* * @test * @summary Test JShell#stop + * @modules jdk.jshell/jdk.internal.jshell.tool * @build KullaTesting TestingInputStream * @run testng StopExecutionTest */ --- old/test/jdk/jshell/T8146368/JShellToolTest8146368.java 2016-01-24 14:01:39.000000000 +0000 +++ new/test/jdk/jshell/T8146368/JShellToolTest8146368.java 2016-01-24 14:01:38.000000000 +0000 @@ -25,6 +25,7 @@ * @test * @bug 8146368 * @summary Test Smashing Error when user language is Japanese + * @modules jdk.jshell/jdk.internal.jshell.tool * @library /tools/lib /jdk/jshell * @build ReplToolTesting * @run testng/othervm -Duser.language=ja JShellToolTest8146368 --- old/test/jdk/jshell/ToolReloadTest.java 2016-01-24 14:01:40.000000000 +0000 +++ new/test/jdk/jshell/ToolReloadTest.java 2016-01-24 14:01:40.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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,9 @@ * @test * @bug 8081845 * @summary Tests for /reload in JShell tool + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * jdk.jshell/jdk.internal.jshell.tool * @library /tools/lib * @build KullaTesting TestingInputStream ToolBox Compiler * @run testng ToolReloadTest --- old/test/lib/combo/TEST.properties 2016-01-24 14:01:42.000000000 +0000 +++ new/test/lib/combo/TEST.properties 2016-01-24 14:01:41.000000000 +0000 @@ -1,4 +1,6 @@ # This file identifies root(s) of the test-ng hierarchy. - TestNG.dirs = . + +modules = \ + jdk.compiler/com.sun.tools.javac.util --- old/test/tools/all/RunCodingRules.java 2016-01-24 14:01:43.000000000 +0000 +++ new/test/tools/all/RunCodingRules.java 2016-01-24 14:01:43.000000000 +0000 @@ -29,6 +29,7 @@ * java.logging * java.xml * jdk.compiler/com.sun.tools.javac.resources + * jdk.compiler/com.sun.tools.javac.util */ --- old/test/tools/javac/6410653/T6410653.java 2016-01-24 14:01:44.000000000 +0000 +++ new/test/tools/javac/6410653/T6410653.java 2016-01-24 14:01:44.000000000 +0000 @@ -27,7 +27,7 @@ * @summary REGRESSION: javac crashes if -d or -s argument is a file * @author Peter von der Ah\u00e9 * @modules java.compiler - * jdk.compiler + * jdk.compiler/com.sun.tools.javac.util */ import java.lang.reflect.Field; --- old/test/tools/javac/6567415/T6567415.java 2016-01-24 14:01:45.000000000 +0000 +++ new/test/tools/javac/6567415/T6567415.java 2016-01-24 14:01:45.000000000 +0000 @@ -26,7 +26,7 @@ * @bug 6567415 * @summary Test to ensure javac does not go into an infinite loop, while * reading a classfile of a specific length. - * @modules jdk.compiler + * @modules jdk.compiler/com.sun.tools.javac.jvm * @compile -XDignore.symbol.file T6567415.java * @run main T6567415 * @author ksrini --- old/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java 2016-01-24 14:01:47.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java 2016-01-24 14:01:47.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042947 * @summary Checking AnnotationDefault attribute. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build AnnotationDefaultTest TestBase TestResult InMemoryFileManager ToolBox AnnotationDefaultVerifier * @run main AnnotationDefaultTest */ --- old/test/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java 2016-01-24 14:01:48.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java 2016-01-24 14:01:48.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042931 * @summary Checking EnclosingMethod attribute of anonymous/local class. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build EnclosingMethodTest TestBase TestResult InMemoryFileManager ToolBox * @run main EnclosingMethodTest */ --- old/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java 2016-01-24 14:01:50.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java 2016-01-24 14:01:50.000000000 +0000 @@ -25,12 +25,11 @@ * @test * @summary Tests a line number table attribute for language constructions in different containers. * @bug 8040131 - * * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api - * jdk.compiler/com.sun.tools.javac.file + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main + * jdk.compiler/com.sun.tools.javac.util + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox TestBase InMemoryFileManager LineNumberTestBase Container TestCase * @run main LineNumberTest */ --- old/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java 2016-01-24 14:01:51.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java 2016-01-24 14:01:51.000000000 +0000 @@ -26,10 +26,10 @@ * @summary local variable table attribute test. * @bug 8040097 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api - * jdk.compiler/com.sun.tools.javac.file + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main + * jdk.compiler/com.sun.tools.javac.util + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox LocalVariableTestBase TestBase InMemoryFileManager * @compile -g LocalVariableTableTest.java * @run main LocalVariableTableTest --- old/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java 2016-01-24 14:01:53.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java 2016-01-24 14:01:52.000000000 +0000 @@ -26,10 +26,10 @@ * @summary local variable type table attribute test. * @bug 8040097 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api - * jdk.compiler/com.sun.tools.javac.file + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main + * jdk.compiler/com.sun.tools.javac.util + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox LocalVariableTestBase TestBase InMemoryFileManager * @compile -g LocalVariableTypeTableTest.java * @run main LocalVariableTypeTableTest --- old/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java 2016-01-24 14:01:54.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java 2016-01-24 14:01:54.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8049238 * @summary Checks Signature attribute for constructors. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @build ConstructorTest Driver ExpectedSignature ExpectedSignatureContainer * @run main Driver ConstructorTest --- old/test/tools/javac/classfiles/attributes/Signature/EnumTest.java 2016-01-24 14:01:55.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Signature/EnumTest.java 2016-01-24 14:01:55.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8049238 * @summary Checks Signature attribute for enum. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @build EnumTest Driver ExpectedSignature ExpectedSignatureContainer * @run main Driver EnumTest --- old/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java 2016-01-24 14:01:57.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java 2016-01-24 14:01:56.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8049238 * @summary Checks Signature attribute for methods which throw exceptions. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @build ExceptionTest Driver ExpectedSignature ExpectedSignatureContainer * @run main Driver ExceptionTest --- old/test/tools/javac/classfiles/attributes/Signature/FieldTest.java 2016-01-24 14:01:58.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Signature/FieldTest.java 2016-01-24 14:01:58.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8049238 * @summary Checks Signature attribute for fields. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @build FieldTest Driver ExpectedSignature ExpectedSignatureContainer * @run main Driver FieldTest --- old/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java 2016-01-24 14:01:59.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java 2016-01-24 14:01:59.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8049238 * @summary Checks Signature attribute for inner classes. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @build InnerClassTest Driver ExpectedSignature ExpectedSignatureContainer * @run main Driver InnerClassTest --- old/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java 2016-01-24 14:02:01.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java 2016-01-24 14:02:00.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8049238 * @summary Checks Signature attribute for method parameters. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @build MethodParameterTest Driver ExpectedSignature ExpectedSignatureContainer * @run main Driver MethodParameterTest --- old/test/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java 2016-01-24 14:02:02.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java 2016-01-24 14:02:01.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8049238 * @summary Checks Signature attribute for type bounds. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @build MethodTypeBoundTest Driver ExpectedSignature ExpectedSignatureContainer * @run main Driver MethodTypeBoundTest --- old/test/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java 2016-01-24 14:02:03.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java 2016-01-24 14:02:03.000000000 +0000 @@ -27,10 +27,10 @@ * @summary Checks Signature attribute for array return type of method. * @library /tools/lib /tools/javac/lib ../lib * @modules java.desktop - * jdk.jdeps/com.sun.tools.classfile * jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @build ReturnTypeTest Driver ExpectedSignature ExpectedSignatureContainer * @run main Driver ReturnTypeTest --- old/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java 2016-01-24 14:02:04.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java 2016-01-24 14:02:04.000000000 +0000 @@ -26,10 +26,10 @@ * @summary sourcefile attribute test for anonymous class. * @bug 8040129 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager * @run main AnonymousClassTest */ --- old/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java 2016-01-24 14:02:05.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java 2016-01-24 14:02:05.000000000 +0000 @@ -26,10 +26,10 @@ * @summary sourcefile attribute test for inner class. * @bug 8040129 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager * @run main InnerClassTest */ --- old/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java 2016-01-24 14:02:06.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java 2016-01-24 14:02:06.000000000 +0000 @@ -26,10 +26,10 @@ * @summary sourcefile attribute test for local class. * @bug 8040129 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager * @run main LocalClassTest */ --- old/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java 2016-01-24 14:02:07.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java 2016-01-24 14:02:07.000000000 +0000 @@ -26,10 +26,10 @@ * @summary sourcefile attribute test for complex structure of nested classes and other types. * @bug 8040129 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager * @run main MixTest */ --- old/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java 2016-01-24 14:02:09.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java 2016-01-24 14:02:08.000000000 +0000 @@ -26,10 +26,10 @@ * @summary sourcefile attribute test for file compiled without debug information. * @bug 8040129 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager * @compile -g:none NoSourceFileAttribute.java * @run main NoSourceFileAttribute --- old/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java 2016-01-24 14:02:10.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java 2016-01-24 14:02:10.000000000 +0000 @@ -26,10 +26,10 @@ * @summary sourcefile attribute test for synthetic class. * @bug 8040129 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager * @run main SyntheticClassTest */ --- old/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java 2016-01-24 14:02:11.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java 2016-01-24 14:02:11.000000000 +0000 @@ -26,10 +26,10 @@ * @summary sourcefile attribute test for two type in one file. * @bug 8040129 * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager * @run main TopLevelClassesOneFileTest */ --- old/test/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java 2016-01-24 14:02:12.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java 2016-01-24 14:02:12.000000000 +0000 @@ -25,7 +25,11 @@ * @test * @bug 8044537 * @summary Checking ACC_SYNTHETIC flag is generated for access method -* generated to access to private methods and fields. + * generated to access to private methods and fields. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @library /tools/lib /tools/javac/lib ../lib * @build TestBase TestResult InMemoryFileManager ToolBox * @build AccessToPrivateInnerClassMembersTest SyntheticTestDriver ExpectedClass ExpectedClasses --- old/test/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java 2016-01-24 14:02:13.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java 2016-01-24 14:02:13.000000000 +0000 @@ -26,6 +26,9 @@ * @bug 8044537 * @summary Checking ACC_SYNTHETIC flag is generated for access method * generated to access to private methods and fields. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @library /tools/lib /tools/javac/lib ../lib * @build TestBase TestResult InMemoryFileManager ToolBox * @build AccessToPrivateSiblingsTest SyntheticTestDriver ExpectedClass ExpectedClasses --- old/test/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java 2016-01-24 14:02:14.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java 2016-01-24 14:02:14.000000000 +0000 @@ -25,6 +25,10 @@ * @test * @bug 8044537 * @summary Checking ACC_SYNTHETIC flag is generated for assert statement. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @library /tools/lib /tools/javac/lib ../lib * @build TestBase TestResult InMemoryFileManager ToolBox * @build AssertFieldTest SyntheticTestDriver ExpectedClass ExpectedClasses --- old/test/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java 2016-01-24 14:02:15.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java 2016-01-24 14:02:15.000000000 +0000 @@ -25,6 +25,10 @@ * @test * @bug 8044537 * @summary Checking ACC_SYNTHETIC flag is generated for bridge method generated for generic method. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @library /tools/lib /tools/javac/lib ../lib * @build TestBase TestResult InMemoryFileManager ToolBox * @build BridgeMethodForGenericMethodTest SyntheticTestDriver ExpectedClass ExpectedClasses --- old/test/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java 2016-01-24 14:02:16.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java 2016-01-24 14:02:16.000000000 +0000 @@ -26,6 +26,10 @@ * @bug 8044537 * @summary Checking ACC_SYNTHETIC flag is generated for bridge method * generated for lambda expressions and method references. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @library /tools/lib /tools/javac/lib ../lib * @build TestBase TestResult InMemoryFileManager ToolBox * @build BridgeMethodsForLambdaTest SyntheticTestDriver ExpectedClass ExpectedClasses --- old/test/tools/javac/classfiles/attributes/Synthetic/EnumTest.java 2016-01-24 14:02:17.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Synthetic/EnumTest.java 2016-01-24 14:02:17.000000000 +0000 @@ -25,6 +25,10 @@ * @test * @bug 8044537 * @summary Checking ACC_SYNTHETIC flag is generated for enum members. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @library /tools/lib /tools/javac/lib ../lib * @build TestBase TestResult InMemoryFileManager ToolBox * @build EnumTest SyntheticTestDriver ExpectedClass ExpectedClasses --- old/test/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java 2016-01-24 14:02:18.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java 2016-01-24 14:02:18.000000000 +0000 @@ -25,6 +25,10 @@ * @test * @bug 8044537 * @summary Checking ACC_SYNTHETIC flag is generated for package-info. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @library /tools/lib /tools/javac/lib ../lib * @build TestBase TestResult InMemoryFileManager ToolBox * @build SyntheticTestDriver ExpectedClass ExpectedClasses --- old/test/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java 2016-01-24 14:02:19.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java 2016-01-24 14:02:19.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8044537 * @summary Checking ACC_SYNTHETIC flag is generated for "this$0" field. + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @library /tools/lib /tools/javac/lib ../lib * @build TestBase TestResult InMemoryFileManager ToolBox * @build ThisFieldTest SyntheticTestDriver ExpectedClass ExpectedClasses --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java 2016-01-24 14:02:20.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java 2016-01-24 14:02:20.000000000 +0000 @@ -26,6 +26,9 @@ * @bug 8044411 * @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute. * Checks that the attribute is generated for bridge method. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java 2016-01-24 14:02:21.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java 2016-01-24 14:02:20.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8044411 * @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java 2016-01-24 14:02:22.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java 2016-01-24 14:02:22.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8044411 * @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java 2016-01-24 14:02:23.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java 2016-01-24 14:02:23.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8044411 * @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java 2016-01-24 14:02:25.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java 2016-01-24 14:02:24.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8044411 * @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java 2016-01-24 14:02:26.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java 2016-01-24 14:02:26.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8044411 * @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java 2016-01-24 14:02:27.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java 2016-01-24 14:02:27.000000000 +0000 @@ -26,6 +26,9 @@ * @bug 8044411 * @summary Tests the RuntimeParameterVisibleAnnotations/RuntimeParameterInvisibleAnnotations attribute. * Checks that the attribute is generated for bridge method. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java 2016-01-24 14:02:28.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java 2016-01-24 14:02:27.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8044411 8079060 8138612 * @summary Tests the RuntimeParameterVisibleAnnotations/RuntimeParameterInvisibleAnnotations attribute. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java 2016-01-24 14:02:29.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java 2016-01-24 14:02:29.000000000 +0000 @@ -25,6 +25,9 @@ * @test * @bug 8044411 * @summary Tests the RuntimeParameterVisibleAnnotations/RuntimeParameterInvisibleAnnotations attribute. + * @modules jdk.jdeps/com.sun.tools.classfile + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main * @library /tools/lib /tools/javac/lib ../lib * @build WorkAnnotations TestBase TestResult InMemoryFileManager ToolBox * @build TestCase ClassType TestAnnotationInfo --- old/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java 2016-01-24 14:02:30.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java 2016-01-24 14:02:30.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042261 * @summary Checking that deprecated attribute does not apply to classes of deprecated package. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api - * jdk.compiler/com.sun.tools.javac.file + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main + * jdk.compiler/com.sun.tools.javac.util + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox TestBase TestResult InMemoryFileManager * @run main DeprecatedPackageTest */ --- old/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java 2016-01-24 14:02:31.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java 2016-01-24 14:02:31.000000000 +0000 @@ -27,10 +27,10 @@ * @summary Checking what attribute is generated by annotation Deprecated * or javadoc deprecated for field, method, class(inner/local), interface. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api - * jdk.compiler/com.sun.tools.javac.file + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main + * jdk.compiler/com.sun.tools.javac.util + * jdk.jdeps/com.sun.tools.classfile * @build ToolBox TestBase TestResult InMemoryFileManager * @run main DeprecatedTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java 2016-01-24 14:02:33.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java 2016-01-24 14:02:32.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner annotations in inner annotation. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerAnnotationsInInnerAnnotationTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java 2016-01-24 14:02:34.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java 2016-01-24 14:02:34.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner annotations in inner class. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerAnnotationsInInnerClassTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java 2016-01-24 14:02:35.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java 2016-01-24 14:02:35.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner annotations in inner enum. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerAnnotationsInInnerEnumTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java 2016-01-24 14:02:37.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java 2016-01-24 14:02:36.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner annotations in inner interface. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerAnnotationsInInnerInterfaceTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java 2016-01-24 14:02:38.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java 2016-01-24 14:02:38.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Test that inner classes have in its inner classes attribute enclosing classes and its immediate members. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestResult TestBase InMemoryFileManager ToolBox * @run main InnerClassesHierarchyTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java 2016-01-24 14:02:40.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java 2016-01-24 14:02:39.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 8062373 * @summary Testing InnerClasses_attribute of inner classes in anonymous class. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox * @run main InnerClassesInAnonymousClassTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java 2016-01-24 14:02:41.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java 2016-01-24 14:02:41.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner classes in inner annotation. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox * @run main InnerClassesInInnerAnnotationTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java 2016-01-24 14:02:43.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java 2016-01-24 14:02:42.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8034854 8042251 * @summary Testing InnerClasses_attribute of inner classes in inner class. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox * @run main InnerClassesInInnerClassTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java 2016-01-24 14:02:44.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java 2016-01-24 14:02:44.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8034854 8042251 * @summary Testing InnerClasses_attribute of inner classes in inner enum. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox * @run main InnerClassesInInnerEnumTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java 2016-01-24 14:02:46.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java 2016-01-24 14:02:45.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner classes in inner interface. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox * @run main InnerClassesInInnerInterfaceTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java 2016-01-24 14:02:47.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java 2016-01-24 14:02:47.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Test that outer_class_info_index of local and anonymous class is zero. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase TestResult InMemoryFileManager ToolBox * @run main InnerClassesIndexTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java 2016-01-24 14:02:48.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java 2016-01-24 14:02:48.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8034854 8042251 * @summary Testing inner classes attributes. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerClassesTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java 2016-01-24 14:02:50.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java 2016-01-24 14:02:50.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner enums in inner annotation. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerEnumInInnerAnnotationTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java 2016-01-24 14:02:51.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java 2016-01-24 14:02:51.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner enums in inner enum. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerEnumInInnerEnumTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java 2016-01-24 14:02:53.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java 2016-01-24 14:02:52.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner enums in inner interface. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerEnumInInnerInterfaceTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java 2016-01-24 14:02:54.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java 2016-01-24 14:02:54.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner enums in inner class. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerEnumsInInnerClassTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java 2016-01-24 14:02:56.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java 2016-01-24 14:02:56.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner interfaces in inner annotation. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerInterfacesInInnerAnnotationTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java 2016-01-24 14:02:57.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java 2016-01-24 14:02:57.000000000 +0000 @@ -26,10 +26,10 @@ * @summary Testing InnerClasses_attribute of inner interfaces in inner class. * @author aeremeev * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerInterfacesInInnerClassTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java 2016-01-24 14:02:59.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java 2016-01-24 14:02:58.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner interfaces in inner enum. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerInterfacesInInnerEnumTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java 2016-01-24 14:03:00.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java 2016-01-24 14:03:00.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Testing InnerClasses_attribute of inner interfaces in inner interface. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox * @run main InnerInterfacesInInnerInterfaceTest */ --- old/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java 2016-01-24 14:03:01.000000000 +0000 +++ new/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java 2016-01-24 14:03:01.000000000 +0000 @@ -26,10 +26,10 @@ * @bug 8042251 * @summary Test that there are no inner classes attributes in case of there are no inner classes. * @library /tools/lib /tools/javac/lib ../lib - * @modules jdk.jdeps/com.sun.tools.classfile - * jdk.compiler/com.sun.tools.javac.api + * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile * @build TestBase InMemoryFileManager ToolBox * @run main NoInnerClassesTest */ --- old/test/tools/javac/failover/CheckAttributedTree.java 2016-01-24 14:03:03.000000000 +0000 +++ new/test/tools/javac/failover/CheckAttributedTree.java 2016-01-24 14:03:02.000000000 +0000 @@ -28,7 +28,10 @@ * temporarily workaround combo tests are causing time out in several platforms * @library ../lib * @modules java.desktop + * jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.code + * jdk.compiler/com.sun.tools.javac.comp + * jdk.compiler/com.sun.tools.javac.main * jdk.compiler/com.sun.tools.javac.tree * jdk.compiler/com.sun.tools.javac.util * @build combo.ComboTestHelper --- old/test/tools/javac/lexer/JavaLexerTest.java 2016-01-24 14:03:04.000000000 +0000 +++ new/test/tools/javac/lexer/JavaLexerTest.java 2016-01-24 14:03:03.000000000 +0000 @@ -24,6 +24,8 @@ /** * @test * @bug 8056897 + * @modules jdk.compiler/com.sun.tools.javac.parser + * jdk.compiler/com.sun.tools.javac.util * @summary Proper lexing of integer literals. */ @@ -78,4 +80,4 @@ throw new AssertionError("Unexpected token text: " + actualText); } } -} \ No newline at end of file +} --- old/test/tools/javac/options/release/ReleaseOptionClashes.java 2016-01-24 14:03:05.000000000 +0000 +++ new/test/tools/javac/options/release/ReleaseOptionClashes.java 2016-01-24 14:03:04.000000000 +0000 @@ -25,6 +25,7 @@ * @test * @bug 8072480 * @summary Verify option clash between -release and -source is reported correctly. + * @modules jdk.compiler/com.sun.tools.javac.util */ import java.io.ByteArrayOutputStream; --- old/test/tools/javadoc/CompletionError.java 2016-01-24 14:03:06.000000000 +0000 +++ new/test/tools/javadoc/CompletionError.java 2016-01-24 14:03:06.000000000 +0000 @@ -27,7 +27,7 @@ * @summary Check that CompletionFailures for missing classes are not incorrectly passed to * the javadoc API clients. * @library /tools/lib - * @modules jdk.javadoc + * @modules jdk.javadoc com.sun.tools.javac.api * @run main CompletionError */ --- old/test/tools/javadoc/sampleapi/SampleApiTest.java 2016-01-24 14:03:07.000000000 +0000 +++ new/test/tools/javadoc/sampleapi/SampleApiTest.java 2016-01-24 14:03:07.000000000 +0000 @@ -25,6 +25,11 @@ * @test * @bug 8130880 * @library lib + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.code + * jdk.compiler/com.sun.tools.javac.parser + * jdk.compiler/com.sun.tools.javac.tree + * jdk.compiler/com.sun.tools.javac.util * @run main sampleapi.SampleApiDefaultRunner -o:out/src * @run main SampleApiTest */ --- old/test/tools/javap/classfile/6888367/T6888367.java 2016-01-24 14:03:09.000000000 +0000 +++ new/test/tools/javap/classfile/6888367/T6888367.java 2016-01-24 14:03:08.000000000 +0000 @@ -37,6 +37,7 @@ * @test * @bug 6888367 * @summary classfile library parses signature attributes incorrectly + * @modules jdk.jdeps/com.sun.tools.classfile */ /*