stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8060432: tools/pack200/TestNormal.java fails on Windows with java.io.FileNotFoundException after JDK-8058854

Browse Source 
Reviewed-by: ksrini
This commit is contained in:
Amy Lu 2014-10-16 19:27:46 -07:00 committed by Kumar Srinivasan
parent 839cec40e9
commit f9e2e24757
1 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
jdk/test/tools/pack200/TestNormal.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -42,23 +42,15 @@ public class TestNormal {
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
Properties p = System.getProperties(); Properties p = System.getProperties();
String java_home = p.getProperty("test.jdk"); String java_home = p.getProperty("test.jdk");
File testJar = new File("test.jar"); String testdir = Utils.TEST_CLS_DIR.getAbsolutePath();
Utils.jar("cvf", testJar.getName(), Utils.TEST_CLS_DIR.getAbsolutePath());
File folder = new File("testdir");
if (folder.exists()) {
delete(folder);
}
folder.mkdir();
try { try {
extractJar(new JarFile(testJar), folder); execJavaCommand(java_home, "jar cnf normalized.jar -C " + testdir + " .");
execJavaCommand(java_home, "jar cnf normalized.jar -C testdir ."); execJavaCommand(java_home, "jar cf original.jar -C " + testdir + " .");
execJavaCommand(java_home, "jar cf original.jar -C testdir .");
execJavaCommand(java_home, "pack200 -r repacked.jar original.jar"); execJavaCommand(java_home, "pack200 -r repacked.jar original.jar");
compareJars(new JarFile("normalized.jar"), new JarFile("repacked.jar")); compareJars(new JarFile("normalized.jar"), new JarFile("repacked.jar"));
} finally { } finally {
String[] cleanupList = {"testdir", "normalized.jar", "original.jar", "repacked.jar"}; String[] cleanupList = {"normalized.jar", "original.jar", "repacked.jar"};
for (String s : cleanupList) { for (String s : cleanupList) {
delete(new File(s)); delete(new File(s));
} }
@ -101,36 +93,6 @@ public class TestNormal {
} }
} }
public static void extractJar(JarFile jf, File where) throws Exception {
for (JarEntry file : Collections.list(jf.entries())) {
File out = new File(where, file.getName());
if (file.isDirectory()) {
out.mkdirs();
continue;
}
File parent = out.getParentFile();
if (parent != null && !parent.exists()) {
parent.mkdirs();
}
InputStream is = null;
OutputStream os = null;
try {
is = jf.getInputStream(file);
os = new FileOutputStream(out);
while (is.available() > 0) {
os.write(is.read());
}
} finally {
if (is != null) {
is.close();
}
if (os != null) {
os.close();
}
}
}
}
static void delete(File f) throws IOException { static void delete(File f) throws IOException {
if (!f.exists()) { if (!f.exists()) {
return; return;