mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-19 18:44:38 +02:00
8187443: Forest Consolidation: Move files to unified layout
Reviewed-by: darcy, ihse
This commit is contained in:
parent
270fe13182
commit
3789983e89
56923 changed files with 3 additions and 15727 deletions
|
@ -1,60 +0,0 @@
|
|||
/*
|
||||
* 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
|
||||
* 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 6890226
|
||||
* @summary javah -version is broken
|
||||
* @modules jdk.compiler/com.sun.tools.javah
|
||||
*/
|
||||
|
||||
import java.io.*;
|
||||
import java.util.Locale;
|
||||
|
||||
public class VersionTest {
|
||||
public static void main(String... args) {
|
||||
Locale prev = Locale.getDefault();
|
||||
try {
|
||||
Locale.setDefault(Locale.ENGLISH);
|
||||
System.err.println(Locale.getDefault());
|
||||
test("-version -XDsuppress-tool-removal-message", "\\S+ version \"\\S+\"");
|
||||
test("-fullversion -XDsuppress-tool-removal-message", "\\S+ full version \"\\S+\"");
|
||||
} finally {
|
||||
Locale.setDefault(prev);
|
||||
}
|
||||
}
|
||||
|
||||
static void test(String option, String regex) {
|
||||
StringWriter sw = new StringWriter();
|
||||
PrintWriter pw = new PrintWriter(sw);
|
||||
String[] args = option.split(" ");
|
||||
int rc = com.sun.tools.javah.Main.run(args, pw);
|
||||
pw.close();
|
||||
if (rc != 0)
|
||||
throw new Error("javah failed: rc=" + rc);
|
||||
String out = sw.toString().trim();
|
||||
System.err.println(out);
|
||||
if (!out.matches(regex))
|
||||
throw new Error("output does not match pattern: " + regex);
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue