14 * 15 * You should have received a copy of the GNU General Public License version 16 * 2 along with this work; if not, write to the Free Software Foundation, 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 * 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 20 * or visit www.oracle.com if you need additional information or have any 21 * questions. 22 */ 23 24 /* 25 * @test 26 * @summary verify that we can override sources to be compiled 27 * @bug 8054689 28 * @author Fredrik O 29 * @author sogoel (rewrite) 30 * @library /tools/lib 31 * @modules jdk.compiler/com.sun.tools.javac.api 32 * jdk.compiler/com.sun.tools.javac.main 33 * jdk.compiler/com.sun.tools.sjavac 34 * jdk.jdeps/com.sun.tools.javap 35 * @build Wrapper toolbox.ToolBox 36 * @run main Wrapper CompileWithOverrideSources 37 */ 38 39 import java.util.*; 40 import java.nio.file.*; 41 42 public class CompileWithOverrideSources extends SJavacTester { 43 public static void main(String... args) throws Exception { 44 CompileWithOverrideSources cos = new CompileWithOverrideSources(); 45 cos.test(); 46 } 47 48 // Compile gensrc and gensrc2. However do not compile broken beta.B in gensrc, 49 // only compile ok beta.B in gensrc2 50 void test() throws Exception { 51 Files.createDirectories(BIN); 52 53 Map<String,Long> previous_bin_state = collectState(BIN); 54 ToolBox tb = new ToolBox(); 55 tb.writeFile(GENSRC.resolve("alfa/omega/A.java"), 56 "package alfa.omega; import beta.B; import gamma.C; public class A { B b; C c; }"); 57 tb.writeFile(GENSRC.resolve("beta/B.java"), 58 "package beta; public class B { broken"); 59 tb.writeFile(GENSRC.resolve("gamma/C.java"), 60 "package gamma; public class C { }"); 61 62 tb.writeFile(GENSRC2.resolve("beta/B.java"), 63 "package beta; public class B { }"); 64 65 compile("-x", "beta/*", 66 GENSRC.toString(), 67 GENSRC2.toString(), 68 "-d", BIN.toString(), 69 "--state-dir=" + BIN, 70 "-h", HEADERS.toString(), 71 "-j", "1"); 72 Map<String,Long> new_bin_state = collectState(BIN); 73 verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state, 74 BIN + "/alfa/omega/A.class", | 14 * 15 * You should have received a copy of the GNU General Public License version 16 * 2 along with this work; if not, write to the Free Software Foundation, 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 * 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 20 * or visit www.oracle.com if you need additional information or have any 21 * questions. 22 */ 23 24 /* 25 * @test 26 * @summary verify that we can override sources to be compiled 27 * @bug 8054689 28 * @author Fredrik O 29 * @author sogoel (rewrite) 30 * @library /tools/lib 31 * @modules jdk.compiler/com.sun.tools.javac.api 32 * jdk.compiler/com.sun.tools.javac.main 33 * jdk.compiler/com.sun.tools.sjavac 34 * @build Wrapper toolbox.ToolBox 35 * @run main Wrapper CompileWithOverrideSources 36 */ 37 38 import java.util.*; 39 import java.nio.file.*; 40 41 public class CompileWithOverrideSources extends SJavacTester { 42 public static void main(String... args) throws Exception { 43 CompileWithOverrideSources cos = new CompileWithOverrideSources(); 44 cos.test(); 45 } 46 47 // Compile gensrc and gensrc2. However do not compile broken beta.B in gensrc, 48 // only compile ok beta.B in gensrc2 49 void test() throws Exception { 50 Files.createDirectories(BIN); 51 52 Map<String,Long> previous_bin_state = collectState(BIN); 53 tb.writeFile(GENSRC.resolve("alfa/omega/A.java"), 54 "package alfa.omega; import beta.B; import gamma.C; public class A { B b; C c; }"); 55 tb.writeFile(GENSRC.resolve("beta/B.java"), 56 "package beta; public class B { broken"); 57 tb.writeFile(GENSRC.resolve("gamma/C.java"), 58 "package gamma; public class C { }"); 59 60 tb.writeFile(GENSRC2.resolve("beta/B.java"), 61 "package beta; public class B { }"); 62 63 compile("-x", "beta/*", 64 GENSRC.toString(), 65 GENSRC2.toString(), 66 "-d", BIN.toString(), 67 "--state-dir=" + BIN, 68 "-h", HEADERS.toString(), 69 "-j", "1"); 70 Map<String,Long> new_bin_state = collectState(BIN); 71 verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state, 72 BIN + "/alfa/omega/A.class", |