mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 11:04:34 +02:00
8152897: refactor ToolBox to allow reduced documented dependencies
Reviewed-by: vromero
This commit is contained in:
parent
208d93e110
commit
7812306bc0
212 changed files with 3955 additions and 3485 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2010, 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
|
||||
|
@ -27,15 +27,17 @@
|
|||
* @summary ToolProvider should be less compiler-specific
|
||||
* @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.jdeps/com.sun.tools.javap
|
||||
* @build ToolBox
|
||||
* @build toolbox.ToolBox toolbox.JavaTask
|
||||
* @run main HelloWorldTest
|
||||
*/
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import toolbox.JavaTask;
|
||||
import toolbox.Task;
|
||||
import toolbox.ToolBox;
|
||||
|
||||
// verify that running a simple program, such as this one, does not trigger
|
||||
// the loading of ToolProvider or any com.sun.tools.javac class
|
||||
public class HelloWorldTest {
|
||||
|
@ -53,15 +55,15 @@ public class HelloWorldTest {
|
|||
|
||||
String classpath = System.getProperty("java.class.path");
|
||||
|
||||
ToolBox.Result tr = tb.new JavaTask()
|
||||
Task.Result tr = new JavaTask(tb)
|
||||
.vmOptions("-verbose:class")
|
||||
.classpath(classpath)
|
||||
.className(HelloWorldTest.class.getName())
|
||||
.classArgs("Hello", "World")
|
||||
.run();
|
||||
|
||||
if (tr.getOutput(ToolBox.OutputKind.STDOUT).contains("java.lang.Object")) {
|
||||
for (String line : tr.getOutputLines(ToolBox.OutputKind.STDOUT)) {
|
||||
if (tr.getOutput(Task.OutputKind.STDOUT).contains("java.lang.Object")) {
|
||||
for (String line : tr.getOutputLines(Task.OutputKind.STDOUT)) {
|
||||
System.err.println(line);
|
||||
if (line.contains("javax.tools.ToolProvider") || line.contains("com.sun.tools.javac."))
|
||||
error(">>> " + line);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue