mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 11:04:34 +02:00
8050429: Update/cleanup ToolBox
Reviewed-by: vromero
This commit is contained in:
parent
14fcc1d07d
commit
33e6564a6b
54 changed files with 2577 additions and 1792 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013, 2014, 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
|
||||
|
@ -27,7 +27,7 @@
|
|||
* @test
|
||||
* @bug 8010659
|
||||
* @summary Javac Crashes while building OpenJFX
|
||||
* @library /tools/javac/lib
|
||||
* @library /tools/lib
|
||||
* @build ToolBox
|
||||
* @run main CompilerCrashWhenMixingBinariesAndSourcesTest
|
||||
*/
|
||||
|
@ -48,19 +48,18 @@ public class CompilerCrashWhenMixingBinariesAndSourcesTest {
|
|||
" Object m(int i) {return null;}\n" +
|
||||
"}";
|
||||
|
||||
public static void main (String[] args) throws Exception{
|
||||
ToolBox.JavaToolArgs javacParams = new ToolBox.JavaToolArgs()
|
||||
.setSources(ASource, BSource, CSource, DSource);
|
||||
ToolBox.javac(javacParams);
|
||||
public static void main(String[] args) throws Exception {
|
||||
ToolBox tb = new ToolBox();
|
||||
|
||||
ToolBox.rm("A.class");
|
||||
ToolBox.rm("A$1.class");
|
||||
ToolBox.rm("C.class");
|
||||
ToolBox.rm("D.class");
|
||||
tb.new JavacTask()
|
||||
.sources(ASource, BSource, CSource, DSource)
|
||||
.run();
|
||||
|
||||
javacParams = new ToolBox.JavaToolArgs()
|
||||
.setOptions("-cp", ".")
|
||||
.setSources(ASource, CSource, DSource);
|
||||
ToolBox.javac(javacParams);
|
||||
tb.deleteFiles("A.class", "A$1.class", "C.class", "D.class");
|
||||
|
||||
tb.new JavacTask()
|
||||
.classpath(".")
|
||||
.sources(ASource, CSource, DSource)
|
||||
.run();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue