2010-12-08 21:42:57 +00:00
|
|
|
/*
|
8142968: Module System implementation
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
2016-03-17 19:04:28 +00:00
|
|
|
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
|
2010-12-08 21:42:57 +00:00
|
|
|
* 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 7004698
|
|
|
|
* @summary javap does not output CharacterRangeTable attributes correctly
|
8142968: Module System implementation
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
2016-03-17 19:04:28 +00:00
|
|
|
* @modules jdk.jdeps/com.sun.tools.javap
|
2010-12-08 21:42:57 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
import java.io.*;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.regex.*;
|
|
|
|
|
|
|
|
public class T7004698 {
|
|
|
|
public static void main(String... args) throws Exception {
|
|
|
|
new T7004698().run();
|
|
|
|
}
|
|
|
|
|
|
|
|
void run() throws Exception {
|
|
|
|
File srcDir = new File(System.getProperty("test.src"));
|
|
|
|
File srcFile = new File(srcDir, T7004698.class.getSimpleName() + ".java");
|
|
|
|
File classesDir = new File(".");
|
8142968: Module System implementation
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
2016-03-17 19:04:28 +00:00
|
|
|
compile("-Xjcov",
|
2017-01-18 09:35:23 +00:00
|
|
|
"--add-modules", "jdk.jdeps",
|
2016-08-10 22:47:46 +00:00
|
|
|
"--add-exports", "jdk.jdeps/com.sun.tools.javap=ALL-UNNAMED",
|
8142968: Module System implementation
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
2016-03-17 19:04:28 +00:00
|
|
|
"-d", classesDir.getPath(),
|
|
|
|
srcFile.getPath());
|
2010-12-08 21:42:57 +00:00
|
|
|
|
|
|
|
File classFile = new File(classesDir, T7004698.class.getSimpleName() + ".class");
|
|
|
|
String out = javap("-v", classFile.getPath());
|
|
|
|
|
|
|
|
Pattern attrBody = Pattern.compile("[0-9a-f, ]+//[-0-9a-z:, ]+");
|
|
|
|
Pattern endOfAttr = Pattern.compile("(^$|[A-Z][A-Za-z0-9_]+:.*|})");
|
|
|
|
boolean inAttr = false;
|
|
|
|
int count = 0;
|
|
|
|
int errors = 0;
|
|
|
|
for (String line: out.split(System.getProperty("line.separator"))) {
|
|
|
|
line = line.trim();
|
|
|
|
if (line.equals("CharacterRangeTable:")) {
|
|
|
|
inAttr = true;
|
|
|
|
count++;
|
|
|
|
} else if (inAttr) {
|
|
|
|
if (endOfAttr.matcher(line).matches()) {
|
|
|
|
inAttr = false;
|
|
|
|
} else if (!attrBody.matcher(line).matches()) {
|
|
|
|
System.err.println("unexpected line found: " + line);
|
|
|
|
errors++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (count == 0)
|
|
|
|
throw new Exception("no attribute instances found");
|
|
|
|
|
|
|
|
if (errors > 0)
|
|
|
|
throw new Exception(errors + " errors found");
|
|
|
|
}
|
|
|
|
|
|
|
|
void compile(String... args) throws Exception {
|
|
|
|
StringWriter sw = new StringWriter();
|
|
|
|
PrintWriter pw = new PrintWriter(sw);
|
|
|
|
int rc = com.sun.tools.javac.Main.compile(args, pw);
|
|
|
|
pw.close();
|
|
|
|
String out = sw.toString();
|
|
|
|
if (!out.isEmpty())
|
|
|
|
System.err.println(out);
|
|
|
|
if (rc != 0)
|
|
|
|
throw new Exception("javac failed unexpectedly; rc=" + rc);
|
|
|
|
}
|
|
|
|
|
|
|
|
String javap(String... args) throws Exception {
|
|
|
|
StringWriter sw = new StringWriter();
|
|
|
|
PrintWriter pw = new PrintWriter(sw);
|
|
|
|
int rc = com.sun.tools.javap.Main.run(args, pw);
|
|
|
|
pw.close();
|
|
|
|
String out = sw.toString();
|
|
|
|
if (!out.isEmpty())
|
|
|
|
System.err.println(out);
|
|
|
|
if (rc != 0)
|
|
|
|
throw new Exception("javap failed unexpectedly; rc=" + rc);
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
}
|