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
78 lines
2.6 KiB
Java
78 lines
2.6 KiB
Java
/*
|
|
* Copyright (c) 2008, 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
|
|
* @bug 4501660
|
|
* @summary change diagnostic of -help as 'print this help message and exit'
|
|
* (actually, verify -help does not cause premature exit)
|
|
* @modules jdk.jdeps/com.sun.tools.javap
|
|
*/
|
|
|
|
import java.io.*;
|
|
import java.util.zip.*;
|
|
|
|
public class T4501660 {
|
|
public static void main(String[] args) throws Exception {
|
|
new T4501660().run();
|
|
}
|
|
|
|
public void run() throws IOException {
|
|
String testClasses = System.getProperty("test.classes", ".");
|
|
String output = javap("-classpath", testClasses, "-help", "T4501660");
|
|
verify(output,
|
|
"-public", "-protected", "-private", // check -help output is present
|
|
"class T4501660" // check class output is present
|
|
);
|
|
|
|
if (errors > 0)
|
|
throw new Error(errors + " found.");
|
|
}
|
|
|
|
String javap(String... args) {
|
|
StringWriter sw = new StringWriter();
|
|
PrintWriter out = new PrintWriter(sw);
|
|
//sun.tools.javap.Main.entry(args);
|
|
int rc = com.sun.tools.javap.Main.run(args, out);
|
|
if (rc != 0)
|
|
throw new Error("javap failed. rc=" + rc);
|
|
out.close();
|
|
System.out.println(sw);
|
|
return sw.toString();
|
|
}
|
|
|
|
void verify(String output, String... expects) {
|
|
for (String expect: expects) {
|
|
if (output.indexOf(expect)< 0)
|
|
error(expect + " not found");
|
|
}
|
|
}
|
|
|
|
void error(String msg) {
|
|
System.err.println(msg);
|
|
errors++;
|
|
}
|
|
|
|
int errors;
|
|
}
|