author | chegar |
Wed, 20 Jun 2018 16:53:56 +0100 | |
branch | http-client-branch |
changeset 56792 | 9064af483bc5 |
parent 49258 | be0ec3cc0c2a |
permissions | -rw-r--r-- |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
1 |
/* |
48676
f8188cc0d01d
8179294: several langtools tests depend on jar, jlink, javac but do not declare that dependency
anazarov
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved. |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
4 |
* |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
8 |
* |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
13 |
* accompanied this code). |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
14 |
* |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
18 |
* |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
21 |
* questions. |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
22 |
*/ |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
23 |
|
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
24 |
/* |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
25 |
* @test |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
26 |
* @bug 6575373 6969063 |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
27 |
* @summary verify default properties of the packer/unpacker and segment limit |
49258
be0ec3cc0c2a
8199616: Fix @module declarations in tier1 tests
shurailine
parents:
48676
diff
changeset
|
28 |
* @modules java.logging |
be0ec3cc0c2a
8199616: Fix @module declarations in tier1 tests
shurailine
parents:
48676
diff
changeset
|
29 |
* jdk.compiler |
48676
f8188cc0d01d
8179294: several langtools tests depend on jar, jlink, javac but do not declare that dependency
anazarov
parents:
47216
diff
changeset
|
30 |
* jdk.zipfs |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
31 |
* @compile -XDignore.symbol.file Utils.java Pack200Props.java |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
32 |
* @run main Pack200Props |
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
33 |
* @author ksrini |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
34 |
*/ |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
35 |
|
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
36 |
import java.io.File; |
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
37 |
import java.util.ArrayList; |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
38 |
import java.util.HashMap; |
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
39 |
import java.util.List; |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
40 |
import java.util.Map; |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
41 |
import java.util.jar.Pack200; |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
42 |
import java.util.jar.Pack200.Packer; |
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
43 |
import java.util.logging.Logger; |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
44 |
|
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
45 |
/* |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
46 |
* Run this against a large jar file, by default the packer should generate only |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
47 |
* one segment, parse the output of the packer to verify if this is indeed true. |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
48 |
*/ |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
49 |
|
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
50 |
public class Pack200Props { |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
51 |
|
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
52 |
final static Logger log = Logger.getLogger("Pack200Props"); |
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
53 |
|
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
54 |
public static void main(String... args) throws Exception { |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
55 |
verifyDefaults(); |
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
56 |
File out = new File("test" + Utils.PACK_FILE_EXT); |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
57 |
out.delete(); |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
58 |
verifySegmentLimit(out); |
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
59 |
log.info("cleanup"); |
18594
b6a3c9f71ac8
8017463: [TEST_BUG] 2 tests from tools/pack200/ remain about 1 GB of data in work directory after execution
ksrini
parents:
6322
diff
changeset
|
60 |
Utils.cleanup(); |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
61 |
} |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
62 |
|
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
63 |
static void verifySegmentLimit(File outFile) throws Exception { |
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
64 |
log.info("creating jar"); |
27565 | 65 |
File testJar = Utils.createRtJar(); |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
66 |
|
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
67 |
log.info("using pack200: " + Utils.getPack200Cmd()); |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
68 |
List<String> cmdsList = new ArrayList<>(); |
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
69 |
cmdsList.add(Utils.getPack200Cmd()); |
27940
1ce0acf58d6c
8066745: tools/pack200/Pack200Props.java failed with java.lang.OutOfMemoryError: Java heap space
ksrini
parents:
27565
diff
changeset
|
70 |
cmdsList.add("-J-Xshare:off"); |
1ce0acf58d6c
8066745: tools/pack200/Pack200Props.java failed with java.lang.OutOfMemoryError: Java heap space
ksrini
parents:
27565
diff
changeset
|
71 |
cmdsList.add("-J-Xmx1280m"); |
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
72 |
cmdsList.add("--effort=1"); |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
73 |
cmdsList.add("--verbose"); |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
74 |
cmdsList.add("--no-gzip"); |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
75 |
cmdsList.add(outFile.getName()); |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
76 |
cmdsList.add(testJar.getAbsolutePath()); |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
77 |
List<String> outList = Utils.runExec(cmdsList); |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
78 |
|
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
79 |
log.info("verifying"); |
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
80 |
int count = 0; |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
81 |
for (String line : outList) { |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
82 |
System.out.println(line); |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
83 |
if (line.matches(".*Transmitted.*files of.*input bytes in a segment of.*bytes")) { |
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
84 |
count++; |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
85 |
} |
6314
8ab691ddb904
6966737: (pack200) the pack200 regression tests need to be more robust.
ksrini
parents:
5799
diff
changeset
|
86 |
} |
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
87 |
log.info("fini"); |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
88 |
if (count == 0) { |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
89 |
throw new RuntimeException("no segments or no output ????"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
90 |
} else if (count > 1) { |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
91 |
throw new RuntimeException("multiple segments detected, expected 1"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
92 |
} |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
93 |
} |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
94 |
|
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
95 |
private static void verifyDefaults() { |
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
96 |
log.info("start"); |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
97 |
Map<String, String> expectedDefaults = new HashMap<>(); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
98 |
Packer p = Pack200.newPacker(); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
99 |
expectedDefaults.put("com.sun.java.util.jar.pack.disable.native", |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
100 |
p.FALSE); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
101 |
expectedDefaults.put("com.sun.java.util.jar.pack.verbose", "0"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
102 |
expectedDefaults.put(p.CLASS_ATTRIBUTE_PFX + "CompilationID", "RUH"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
103 |
expectedDefaults.put(p.CLASS_ATTRIBUTE_PFX + "SourceID", "RUH"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
104 |
expectedDefaults.put(p.CODE_ATTRIBUTE_PFX + "CharacterRangeTable", |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
105 |
"NH[PHPOHIIH]"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
106 |
expectedDefaults.put(p.CODE_ATTRIBUTE_PFX + "CoverageTable", |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
107 |
"NH[PHHII]"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
108 |
expectedDefaults.put(p.DEFLATE_HINT, p.KEEP); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
109 |
expectedDefaults.put(p.EFFORT, "5"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
110 |
expectedDefaults.put(p.KEEP_FILE_ORDER, p.TRUE); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
111 |
expectedDefaults.put(p.MODIFICATION_TIME, p.KEEP); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
112 |
expectedDefaults.put(p.SEGMENT_LIMIT, "-1"); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
113 |
expectedDefaults.put(p.UNKNOWN_ATTRIBUTE, p.PASS); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
114 |
|
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
115 |
Map<String, String> props = p.properties(); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
116 |
int errors = 0; |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
117 |
for (String key : expectedDefaults.keySet()) { |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
118 |
String def = expectedDefaults.get(key); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
119 |
String x = props.get(key); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
120 |
if (x == null) { |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
121 |
System.out.println("Error: key not found:" + key); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
122 |
errors++; |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
123 |
} else { |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
124 |
if (!def.equals(x)) { |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
125 |
System.out.println("Error: key " + key |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
126 |
+ "\n value expected: " + def |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
127 |
+ "\n value obtained: " + x); |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
128 |
errors++; |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
129 |
} |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
130 |
} |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
131 |
} |
36948
8727362c1c78
8152622: tools/pack200/Pack200Props.java timed out
ksrini
parents:
32850
diff
changeset
|
132 |
log.info("fini"); |
6322
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
133 |
if (errors > 0) { |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
134 |
throw new RuntimeException(errors + |
0a20892f9af6
6969063: (pack200) The default value of Pack200.Packer.SEGMENT_LIMIT property is empty string instead of -1
ksrini
parents:
6314
diff
changeset
|
135 |
" error(s) encountered in default properties verification"); |
5799
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
136 |
} |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
137 |
} |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
138 |
} |
e0089b2436a4
6575373: Error verifying signatures of pack200 files in some cases
ksrini
parents:
diff
changeset
|
139 |