infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-05 04:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8058854: Remove dependency on dt.jar from test/tools/jar/normalize/TestNormal.java

Browse Source 
Reviewed-by: alanb, ksrini
This commit is contained in:
Amy Lu 2014-10-13 17:43:17 +01:00 committed by Alan Bateman
parent 7467e9bd34
commit ffe5e6e34c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jdk/test/tools/jar/normalize/TestNormal.java → jdk/test/tools/pack200/TestNormal.java
View File

@ -42,23 +42,23 @@ public class TestNormal {
public static void main(String args[]) throws Exception {
Properties p = System.getProperties();
String java_home = p.getProperty("test.jdk");
String dtjar = java_home + File.separator + "lib"
+ File.separator + "dt.jar";
File testJar = new File("test.jar");
Utils.jar("cvf", testJar.getName(), Utils.TEST_CLS_DIR.getAbsolutePath());
File folder = new File("dt");
File folder = new File("testdir");
if (folder.exists()) {
delete(folder);
}
folder.mkdir();
try {
extractJar(new JarFile(dtjar), folder);
execJavaCommand(java_home, "jar cnf normalized.jar -C dt .");
execJavaCommand(java_home, "jar cf original.jar -C dt .");
extractJar(new JarFile(testJar), folder);
execJavaCommand(java_home, "jar cnf normalized.jar -C testdir .");
execJavaCommand(java_home, "jar cf original.jar -C testdir .");
execJavaCommand(java_home, "pack200 -r repacked.jar original.jar");
compareJars(new JarFile("normalized.jar"), new JarFile("repacked.jar"));
} finally {
String[] cleanupList = {"dt", "normalized.jar", "original.jar", "repacked.jar"};
String[] cleanupList = {"testdir", "normalized.jar", "original.jar", "repacked.jar"};
for (String s : cleanupList) {
delete(new File(s));
}