001ebb3a72
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282 Co-authored-by: Alex Buckley <alex.buckley@oracle.com> Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com> Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com> Co-authored-by: Mandy Chung <mandy.chung@oracle.com> Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com> Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com> Co-authored-by: Vicente Romero <vicente.romero@oracle.com> Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com> Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com> Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com> Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com> Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com> Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com> Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
92 lines
3.7 KiB
Java
92 lines
3.7 KiB
Java
/*
|
|
* Copyright (c) 2014, 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
|
|
* under the terms of the GNU General Public License version 2 only, as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
* accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU General Public License version
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
* questions.
|
|
*/
|
|
|
|
/*
|
|
* @test
|
|
* @summary verify that we can override sources to be compiled
|
|
* @bug 8054689
|
|
* @author Fredrik O
|
|
* @author sogoel (rewrite)
|
|
* @library /tools/lib
|
|
* @modules jdk.compiler/com.sun.tools.javac.api
|
|
* jdk.compiler/com.sun.tools.javac.file
|
|
* jdk.compiler/com.sun.tools.javac.main
|
|
* jdk.compiler/com.sun.tools.sjavac
|
|
* jdk.jdeps/com.sun.tools.javap
|
|
* @build Wrapper ToolBox
|
|
* @run main Wrapper CompileWithOverrideSources
|
|
*/
|
|
|
|
import java.util.*;
|
|
import java.nio.file.*;
|
|
|
|
public class CompileWithOverrideSources extends SJavacTester {
|
|
public static void main(String... args) throws Exception {
|
|
CompileWithOverrideSources cos = new CompileWithOverrideSources();
|
|
cos.test();
|
|
}
|
|
|
|
// Compile gensrc and gensrc2. However do not compile broken beta.B in gensrc,
|
|
// only compile ok beta.B in gensrc2
|
|
void test() throws Exception {
|
|
Files.createDirectories(BIN);
|
|
|
|
Map<String,Long> previous_bin_state = collectState(BIN);
|
|
ToolBox tb = new ToolBox();
|
|
tb.writeFile(GENSRC.resolve("alfa/omega/A.java"),
|
|
"package alfa.omega; import beta.B; import gamma.C; public class A { B b; C c; }");
|
|
tb.writeFile(GENSRC.resolve("beta/B.java"),
|
|
"package beta; public class B { broken");
|
|
tb.writeFile(GENSRC.resolve("gamma/C.java"),
|
|
"package gamma; public class C { }");
|
|
|
|
tb.writeFile(GENSRC2.resolve("beta/B.java"),
|
|
"package beta; public class B { }");
|
|
|
|
compile("-x", "beta/*",
|
|
GENSRC.toString(),
|
|
GENSRC2.toString(),
|
|
"-d", BIN.toString(),
|
|
"--state-dir=" + BIN,
|
|
"-h", HEADERS.toString(),
|
|
"-j", "1");
|
|
Map<String,Long> new_bin_state = collectState(BIN);
|
|
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
|
|
BIN + "/alfa/omega/A.class",
|
|
BIN + "/beta/B.class",
|
|
BIN + "/gamma/C.class",
|
|
BIN + "/javac_state");
|
|
|
|
System.out.println("----- Compile with exluded beta went well!");
|
|
tb.cleanDirectory(BIN);
|
|
compileExpectFailure(GENSRC.toString(),
|
|
GENSRC2.toString(),
|
|
"-d", BIN.toString(),
|
|
"--state-dir=" + BIN,
|
|
"-h", HEADERS.toString(),
|
|
"-j", "1");
|
|
|
|
System.out.println("----- Compile without exluded beta failed, as expected! Good!");
|
|
}
|
|
}
|