test/hotspot/jtreg/runtime/appcds/DirClasspathTest.java
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File open Cdiff test/hotspot/jtreg/runtime/appcds/DirClasspathTest.java

test/hotspot/jtreg/runtime/appcds/DirClasspathTest.java

Print this page

        

*** 32,58 **** */ import jdk.test.lib.Platform; import jdk.test.lib.process.OutputAnalyzer; import java.io.File; public class DirClasspathTest { public static void main(String[] args) throws Exception { File dir = new File(System.getProperty("user.dir")); File emptydir = new File(dir, "emptydir"); emptydir.mkdir(); // Empty dir in -cp: should be OK OutputAnalyzer output; - if (!Platform.isWindows()) { - // This block fails on Windows because of JDK-8192927 output = TestCommon.dump(emptydir.getPath(), TestCommon.list("DoesntMatter"), "-Xlog:class+path=info"); TestCommon.checkDump(output); } // Non-empty dir in -cp: should fail // <dir> is not empty because it has at least one subdirectory, i.e., <emptydir> output = TestCommon.dump(dir.getPath(), TestCommon.list("DoesntMatter"), "-Xlog:class+path=info"); output.shouldNotHaveExitValue(0); output.shouldContain("CDS allows only empty directories in archived classpaths"); } } --- 32,83 ---- */ import jdk.test.lib.Platform; import jdk.test.lib.process.OutputAnalyzer; import java.io.File; + import java.nio.file.Path; + import java.nio.file.Paths; + import java.util.Arrays; public class DirClasspathTest { + private static final int MAX_PATH = 260; + public static void main(String[] args) throws Exception { File dir = new File(System.getProperty("user.dir")); File emptydir = new File(dir, "emptydir"); emptydir.mkdir(); // Empty dir in -cp: should be OK OutputAnalyzer output; output = TestCommon.dump(emptydir.getPath(), TestCommon.list("DoesntMatter"), "-Xlog:class+path=info"); TestCommon.checkDump(output); + + // Long path to empty dir in -cp: should be OK + Path classDir = Paths.get(System.getProperty("test.classes")); + Path destDir = classDir; + int subDirLen = MAX_PATH - classDir.toString().length() - 2; + if (subDirLen > 0) { + char[] chars = new char[subDirLen]; + Arrays.fill(chars, 'x'); + String subPath = new String(chars); + destDir = Paths.get(System.getProperty("test.classes"), subPath); } + File longDir = destDir.toFile(); + longDir.mkdir(); + File subDir = new File(longDir, "DoesntMatter"); + subDir.mkdir(); + output = TestCommon.dump(subDir.getPath(), TestCommon.list("DoesntMatter"), "-Xlog:class+path=info"); + TestCommon.checkDump(output); // Non-empty dir in -cp: should fail // <dir> is not empty because it has at least one subdirectory, i.e., <emptydir> output = TestCommon.dump(dir.getPath(), TestCommon.list("DoesntMatter"), "-Xlog:class+path=info"); output.shouldNotHaveExitValue(0); output.shouldContain("CDS allows only empty directories in archived classpaths"); + + // Long path to non-empty dir in -cp: should fail + // <dir> is not empty because it has at least one subdirectory, i.e., <emptydir> + output = TestCommon.dump(longDir.getPath(), TestCommon.list("DoesntMatter"), "-Xlog:class+path=info"); + output.shouldNotHaveExitValue(0); + output.shouldContain("CDS allows only empty directories in archived classpaths"); } }
test/hotspot/jtreg/runtime/appcds/DirClasspathTest.java
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File