jjg@46: /* ohair@554: * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. jjg@46: * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. jjg@46: * jjg@46: * This code is free software; you can redistribute it and/or modify it jjg@46: * under the terms of the GNU General Public License version 2 only, as jjg@46: * published by the Free Software Foundation. jjg@46: * jjg@46: * This code is distributed in the hope that it will be useful, but WITHOUT jjg@46: * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or jjg@46: * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License jjg@46: * version 2 for more details (a copy is included in the LICENSE file that jjg@46: * accompanied this code). jjg@46: * jjg@46: * You should have received a copy of the GNU General Public License version jjg@46: * 2 along with this work; if not, write to the Free Software Foundation, jjg@46: * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. jjg@46: * ohair@554: * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ohair@554: * or visit www.oracle.com if you need additional information or have any ohair@554: * questions. jjg@46: */ jjg@46: jjg@46: /* jjg@46: * @test jjg@46: * @bug 4501660 jjg@46: * @summary change diagnostic of -help as 'print this help message and exit' jjg@46: * (actually, verify -help does not cause premature exit) jjg@46: */ jjg@46: jjg@46: import java.io.*; jjg@46: import java.util.zip.*; jjg@46: jjg@46: public class T4501660 { jjg@46: public static void main(String[] args) throws Exception { jjg@46: new T4501660().run(); jjg@46: } jjg@46: jjg@46: public void run() throws IOException { jjg@46: String testClasses = System.getProperty("test.classes", "."); jjg@46: String output = javap("-classpath", testClasses, "-help", "T4501660"); jjg@46: verify(output, jjg@46: "-public", "-protected", "-private", // check -help output is present jjg@46: "class T4501660" // check class output is present jjg@46: ); jjg@46: jjg@46: if (errors > 0) jjg@46: throw new Error(errors + " found."); jjg@46: } jjg@46: jjg@46: String javap(String... args) { jjg@46: StringWriter sw = new StringWriter(); jjg@46: PrintWriter out = new PrintWriter(sw); jjg@46: //sun.tools.javap.Main.entry(args); jjg@46: int rc = com.sun.tools.javap.Main.run(args, out); jjg@46: if (rc != 0) jjg@46: throw new Error("javap failed. rc=" + rc); jjg@46: out.close(); jjg@46: System.out.println(sw); jjg@46: return sw.toString(); jjg@46: } jjg@46: jjg@46: void verify(String output, String... expects) { jjg@46: for (String expect: expects) { jjg@46: if (output.indexOf(expect)< 0) jjg@46: error(expect + " not found"); jjg@46: } jjg@46: } jjg@46: jjg@46: void error(String msg) { jjg@46: System.err.println(msg); jjg@46: errors++; jjg@46: } jjg@46: jjg@46: int errors; jjg@46: }