changeset 38580:0f5cf0999399

8157931: jdk/internal/jrtfs/Basic.java fails with exploded builds Reviewed-by: alanb, sundar, jlaskey Contributed-by: Felix Yang <felix.yang@oracle.com>
author xiaofeya
date Thu, 26 May 2016 18:56:46 -0700
parents 477f5b3c9973
children e761c1ccd13e
files jdk/test/jdk/internal/jrtfs/Basic.java
diffstat 1 files changed, 39 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/test/jdk/internal/jrtfs/Basic.java	Thu May 26 15:47:39 2016 -0700
+++ b/jdk/test/jdk/internal/jrtfs/Basic.java	Thu May 26 18:56:46 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,15 +65,31 @@
 
     private FileSystem theFileSystem;
     private FileSystem fs;
+    private boolean isExplodedBuild = false;
 
     @BeforeClass
     public void setup() {
+        theFileSystem = FileSystems.getFileSystem(URI.create("jrt:/"));
+        Path javaHomeDir = Paths.get(System.getProperty("java.home"));
+        Path jrtJarPath = javaHomeDir.resolve("jrt-fs.jar");
+        Path modulesPath = javaHomeDir.resolve("lib/modules");
+        isExplodedBuild = !Files.exists(jrtJarPath)
+                && !Files.exists(modulesPath);
+        if (Files.notExists(jrtJarPath)
+                && Files.notExists(modulesPath)) {
+            System.out.printf("Following files not exist: %s, %s",
+                    jrtJarPath.toString(), modulesPath.toString());
+            System.out.println();
+            System.out.println("It is most probably an exploded build."
+                    + " Skip non-default FileSystem testing.");
+            return;
+        }
+
+        Map<String, String> env = new HashMap<>();
+        // set java.home property to be underlying java.home
+        // so that jrt-fs.jar loading is exercised.
+        env.put("java.home", System.getProperty("java.home"));
         try {
-            theFileSystem = FileSystems.getFileSystem(URI.create("jrt:/"));
-            Map<String, String> env = new HashMap<>();
-            // set java.home property to be underlying java.home
-            // so that jrt-fs.jar loading is exercised.
-            env.put("java.home", System.getProperty("java.home"));
             fs = FileSystems.newFileSystem(URI.create("jrt:/"), env);
         } catch (IOException ioExp) {
             throw new RuntimeException(ioExp);
@@ -131,6 +147,12 @@
 
     @Test
     public void testNewFileSystemWithJavaHome() throws Exception {
+        if (isExplodedBuild) {
+            System.out.println("Skip testNewFileSystemWithJavaHome"
+                    + " since this is an exploded build");
+            return;
+        }
+
         Map<String, String> env = new HashMap<>();
         // set java.home property to be underlying java.home
         // so that jrt-fs.jar loading is exercised.
@@ -154,6 +176,11 @@
 
     @Test(dataProvider = "knownClassFiles")
     public void testKnownClassFiles(String path, boolean theDefault) throws Exception {
+        if (isExplodedBuild && !theDefault) {
+            System.out.println("Skip testKnownClassFiles with non-default FileSystem");
+            return;
+        }
+
         FileSystem fs = selectFileSystem(theDefault);
         Path classFile = fs.getPath(path);
 
@@ -201,6 +228,11 @@
 
     @Test(dataProvider = "knownDirectories")
     public void testKnownDirectories(String path, boolean theDefault) throws Exception {
+        if (isExplodedBuild && !theDefault) {
+            System.out.println("Skip testKnownDirectories with non-default FileSystem");
+            return;
+        }
+
         FileSystem fs = selectFileSystem(theDefault);
         Path dir = fs.getPath(path);
 
@@ -684,3 +716,4 @@
         assertEquals(dirPrefixOkayCount, childCount);
     }
 }
+