infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-12 11:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

8009640: -profile <compact> does not work when -bootclasspath specified

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2013-08-10 13:27:38 +01:00
parent 35e27fd594
commit cee3c2853b
3 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
langtools/src/share/classes/com/sun/tools/javac/main/Main.java
View File

@ -262,6 +262,11 @@ public class Main {
}
}
if (options.get(PROFILE) != null && options.get(BOOTCLASSPATH) != null) {
error("err.profile.bootclasspath.conflict");
return null;
}
if (this.classnames != null && classNames != null) {
this.classnames.addAll(Arrays.asList(classNames));
}

2
langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
View File

@ -185,6 +185,8 @@ javac.err.invalid.A.key=\
key in annotation processor option ''{0}'' is not a dot-separated sequence of identifiers
javac.err.invalid.flag=\
invalid flag: {0}
javac.err.profile.bootclasspath.conflict=\
profile and bootclasspath options cannot be used together
javac.err.invalid.profile=\
invalid profile: {0}
javac.err.invalid.target=\

66
langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java Normal file
View File

@ -0,0 +1,66 @@
/*
* Copyright (c) 2013, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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
* @bug 8009640
* @summary -profile <compact> does not work when -bootclasspath specified
* @library /tools/javac/lib
* @build ToolBox
* @run main CheckRejectProfileBCPOptionsIfUsedTogetherTest
*/
import com.sun.tools.javac.util.Assert;
import java.util.ArrayList;
import java.util.List;
public class CheckRejectProfileBCPOptionsIfUsedTogetherTest {
private static final String TestSrc =
"public class Test {\n" +
" javax.swing.JButton b;\n" +
"}";
public static void main(String args[]) throws Exception {
List<String> errOutput = new ArrayList<>();
String testJDK = ToolBox.jdkUnderTest;
ToolBox.createJavaFileFromSource(TestSrc);
ToolBox.AnyToolArgs javacParams =
new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
.appendArgs(ToolBox.javacBinary)
.appendArgs(ToolBox.testToolVMOpts)
.appendArgs("-profile", "compact1", "-bootclasspath",
testJDK + "/jre/lib/rt.jar", "Test.java")
.setErrOutput(errOutput);
ToolBox.executeCommand(javacParams);
Assert.check(errOutput.get(0).startsWith(
"javac: profile and bootclasspath options cannot be used together"),
"Incorrect javac error output");
}
}