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