create VFS entries only up to the mount point

Author: tomasstupka

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/integration/VirtualFileSystemTest.java

@@ -99,10 +99,19 @@ public void defaultValues() {
     @Test
     public void mountPoints() {
         VirtualFileSystem fs = VirtualFileSystem.newBuilder().//
-                        unixMountPoint(VFS_MOUNT_POINT).//
+                        unixMountPoint(VFS_UNIX_MOUNT_POINT).//
                         windowsMountPoint(VFS_WIN_MOUNT_POINT).build();
 
         assertEquals(VFS_MOUNT_POINT, fs.getMountPoint());
+
+        String multiPathUnixMountPoint = "/test/mount/point";
+        String multiPathWinMountPoint = "X:\\test\\win\\mount\\point";
+        VirtualFileSystem vfs = VirtualFileSystem.newBuilder().//
+                        unixMountPoint(multiPathUnixMountPoint).//
+                        windowsMountPoint(multiPathWinMountPoint).//
+                        resourceLoadingClass(VirtualFileSystemTest.class).build();
+        Context ctx = addTestOptions(GraalPyResources.contextBuilder(vfs)).build();
+        ctx.eval(PYTHON, "from os import listdir; listdir('" + (IS_WINDOWS ? multiPathWinMountPoint.replace("\\", "\\\\") : multiPathUnixMountPoint) + "')");
     }
 
     private static void checkExtractedFile(Path extractedFile, String[] expectedContens) throws IOException {
@@ -391,7 +400,6 @@ private void eval(String s) {
 
     private void eval(String s, Function<VirtualFileSystem.Builder, VirtualFileSystem.Builder> builderFunction) {
         String src = patchMountPoint(s);
-
         getContext(builderFunction).eval(PYTHON, src);
     }
 

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/VirtualFileSystemImpl.java

@@ -101,16 +101,7 @@ public synchronized String format(LogRecord lr) {
     /*
      * Root of the virtual filesystem in the resources.
      */
-    private static final String VFS_ROOT;
-    static {
-        String root = System.getProperty("org.graalvm.python.vfs.root");
-        if (root != null && !root.trim().isEmpty()) {
-            VFS_ROOT = root;
-            info("VFS.VFS_ROOT override to'%s'", VFS_ROOT);
-        } else {
-            VFS_ROOT = "/org.graalvm.python.vfs";
-        }
-    }
+    private static final String VFS_ROOT = "/org.graalvm.python.vfs";
 
     static final String VFS_HOME = "home";
     static final String VFS_VENV = "venv";
@@ -378,9 +369,9 @@ private void initEntries() throws IOException {
                 }
 
                 String platformPath = resourcePathToPlatformPath(line);
-                int i = 0;
+                int i = mountPoint.toString().length();
                 DirEntry parent = null;
-                while ((i = platformPath.indexOf(PLATFORM_SEPARATOR, i)) != -1) {
+                do {
                     String dir = platformPath.substring(0, i);
                     String dirKey = toCaseComparable(dir);
                     DirEntry dirEntry = (DirEntry) vfsEntries.get(dirKey);
@@ -394,7 +385,8 @@ private void initEntries() throws IOException {
                     }
                     parent = dirEntry;
                     i++;
-                }
+                } while ((i = platformPath.indexOf(PLATFORM_SEPARATOR, i)) != -1);
+
                 assert parent != null;
                 if (!platformPath.endsWith(PLATFORM_SEPARATOR)) {
                     FileEntry fileEntry = new FileEntry(platformPath);