author | iklam |
Mon, 04 Nov 2019 12:36:54 -0800 | |
changeset 58923 | 2938e0a4e954 |
parent 57705 | 7cf02b2c1455 |
permissions | -rw-r--r-- |
48138 | 1 |
/* |
57567
b000362a89a0
8202339: [TESTBUG] Consolidate the tests in runtime/SharedArchiveFile and runtime/appcds
coleenp
parents:
51990
diff
changeset
|
2 |
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. |
48138 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
* |
|
23 |
*/ |
|
24 |
||
25 |
/* |
|
26 |
* @test |
|
27 |
* @summary Adding extra symbols into CDS archive using -XX:SharedArchiveConfigFile |
|
48469
7312ae4465d6
8193672: [test] Enhance vm.cds property to check for all conditions required to run CDS tests
iklam
parents:
48138
diff
changeset
|
28 |
* @requires vm.cds |
48138 | 29 |
* @library /test/lib |
57705
7cf02b2c1455
8229267: [TESTBUG] Remove unnecessary @modules dependencies in CDS tests
iklam
parents:
57567
diff
changeset
|
30 |
* @modules jdk.jartool/sun.tools.jar |
48138 | 31 |
* @compile test-classes/Hello.java |
51990
6003e034cdd8
8209946: [TESTBUG] CDS tests should use "@run driver"
iklam
parents:
51370
diff
changeset
|
32 |
* @run driver ExtraSymbols |
48138 | 33 |
*/ |
34 |
||
35 |
import java.io.*; |
|
36 |
import jdk.test.lib.process.OutputAnalyzer; |
|
58923
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
37 |
import jdk.test.lib.cds.CDSTestUtils; |
48138 | 38 |
|
39 |
public class ExtraSymbols { |
|
51370
fbb62267e5e9
8208705: [TESTBUG] The -Xlog:cds,cds+hashtables vm option is not always required for appcds tests
ccheung
parents:
48469
diff
changeset
|
40 |
static final String CDS_LOGGING = "-Xlog:cds,cds+hashtables"; |
48138 | 41 |
public static void main(String[] args) throws Exception { |
42 |
String appJar = JarBuilder.getOrCreateHelloJar(); |
|
43 |
||
44 |
// 1. Dump without extra symbols. |
|
51370
fbb62267e5e9
8208705: [TESTBUG] The -Xlog:cds,cds+hashtables vm option is not always required for appcds tests
ccheung
parents:
48469
diff
changeset
|
45 |
OutputAnalyzer output = TestCommon.dump(appJar, TestCommon.list("Hello"), |
fbb62267e5e9
8208705: [TESTBUG] The -Xlog:cds,cds+hashtables vm option is not always required for appcds tests
ccheung
parents:
48469
diff
changeset
|
46 |
CDS_LOGGING); |
48138 | 47 |
checkOutput(output); |
48 |
int numEntries1 = numOfEntries(output); |
|
49 |
||
58923
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
50 |
// 2. Dump an archive with lots of extra symbols. |
51370
fbb62267e5e9
8208705: [TESTBUG] The -Xlog:cds,cds+hashtables vm option is not always required for appcds tests
ccheung
parents:
48469
diff
changeset
|
51 |
output = TestCommon.dump(appJar, TestCommon.list("Hello"), CDS_LOGGING, |
58923
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
52 |
"-XX:SharedArchiveConfigFile=" + makeLotsExtraSymbols()); |
48138 | 53 |
checkOutput(output); |
54 |
int numEntries2 = numOfEntries(output); |
|
55 |
if (numEntries2 <= numEntries1) { |
|
56 |
throw new RuntimeException("No extra symbols added to archive"); |
|
57 |
} |
|
58 |
output = TestCommon.exec(appJar, "Hello"); |
|
59 |
TestCommon.checkExec(output); |
|
60 |
||
61 |
// 3. Dump with invalid symbol files. Dumping should fail. |
|
62 |
String invalid_symbol_files[] = {"ExtraSymbols.invalid_1.txt", |
|
63 |
"ExtraSymbols.invalid_2.txt", |
|
64 |
"ExtraSymbols.invalid_3.txt"}; |
|
65 |
String err_msgs[] = {"Corrupted at line", |
|
66 |
"wrong version of hashtable dump file", |
|
67 |
"Corrupted at line"}; |
|
68 |
for (int i = 0; i < invalid_symbol_files.length; i++) { |
|
69 |
output = TestCommon.dump(appJar, TestCommon.list("Hello"), |
|
70 |
"-XX:SharedArchiveConfigFile=" + |
|
71 |
TestCommon.getSourceFile(invalid_symbol_files[i])); |
|
72 |
output.shouldContain("Error occurred during initialization of VM"); |
|
73 |
output.shouldContain(err_msgs[i]); |
|
74 |
} |
|
75 |
} |
|
76 |
||
77 |
static int numOfEntries(OutputAnalyzer output) { |
|
78 |
String s = output.firstMatch("Number of entries : .*"); |
|
79 |
String subs[] = s.split("[:]"); |
|
80 |
int numEntries = Integer.parseInt(subs[1].trim()); |
|
81 |
return numEntries; |
|
82 |
} |
|
83 |
||
84 |
static void checkOutput(OutputAnalyzer output) throws Exception { |
|
85 |
output.shouldContain("Loading classes to share"); |
|
86 |
output.shouldContain("Shared symbol table stats -------- base:"); |
|
87 |
output.shouldHaveExitValue(0); |
|
88 |
} |
|
58923
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
89 |
|
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
90 |
static String makeLotsExtraSymbols() throws Exception { |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
91 |
String fileName = "LotsExtraSymbols.txt"; |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
92 |
File f = new File(fileName); |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
93 |
try (FileWriter fw = new FileWriter(f)) { |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
94 |
fw.write("VERSION: 1.0\n"); |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
95 |
fw.write("@SECTION: Symbol\n"); |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
96 |
appendSymbol(fw, "This file is auto-generated by test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java. Do not edit."); |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
97 |
appendSymbol(fw, "Hello"); |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
98 |
appendSymbol(fw, ""); // empty string |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
99 |
appendSymbol(fw, "Hello_\u0001"); // <128 escaping with \x |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
100 |
appendSymbol(fw, "Hello_\u00ff"); // <256 escaping with \x |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
101 |
appendSymbol(fw, "Hello_\u1234"); // >= 256 escaping with \x |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
102 |
appendSymbol(fw, "Hello_\uffff"); // >= 256 escaping with \x |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
103 |
|
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
104 |
for (int i = 0; i < 10000; i++) { |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
105 |
appendSymbol(fw, "NewSymbol" + Integer.toString(i)); |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
106 |
} |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
107 |
} |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
108 |
return fileName; |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
109 |
} |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
110 |
|
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
111 |
private static void appendSymbol(FileWriter fw, String symbol) throws Exception { |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
112 |
fw.write(CDSTestUtils.formatArchiveConfigSymbol(symbol)); |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
113 |
fw.write("\n"); |
2938e0a4e954
8232734: [TESTBUG] avoid using JDK symbols in ExtraSymbols.symbols.txt
iklam
parents:
57705
diff
changeset
|
114 |
} |
48138 | 115 |
} |