From ffe5e6e34c0848c9d8cc906d29ef2ef9d952d551 Mon Sep 17 00:00:00 2001 From: Amy Lu Date: Mon, 13 Oct 2014 17:43:17 +0100 Subject: [PATCH] 8058854: Remove dependency on dt.jar from test/tools/jar/normalize/TestNormal.java Reviewed-by: alanb, ksrini --- .../{jar/normalize => pack200}/TestNormal.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename jdk/test/tools/{jar/normalize => pack200}/TestNormal.java (92%) diff --git a/jdk/test/tools/jar/normalize/TestNormal.java b/jdk/test/tools/pack200/TestNormal.java similarity index 92% rename from jdk/test/tools/jar/normalize/TestNormal.java rename to jdk/test/tools/pack200/TestNormal.java index 7db348c1614..5dfe399c64b 100644 --- a/jdk/test/tools/jar/normalize/TestNormal.java +++ b/jdk/test/tools/pack200/TestNormal.java @@ -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)); }