Ticket #4419: fix_cache_creation.patch

source/simulation2/components/tests/test_Pathfinder.h

@@ -37 +37 @@
         g_VFS = CreateVfs(20 * MiB);
         g_VFS->Mount(L"", DataDir()/"mods"/"mod", VFS_MOUNT_MUST_EXIST);
         g_VFS->Mount(L"", DataDir()/"mods"/"public", VFS_MOUNT_MUST_EXIST, 1); // ignore directory-not-found errors
-        g_VFS->Mount(L"cache/", DataDir() / "cache");
+        TS_ASSERT_OK(g_VFS->Mount(L"cache", DataDir()/"_testcache"));
 
         CXeromyces::Startup();
 
@@ -52 +52 @@
         delete &g_TexMan;
         CXeromyces::Terminate();
         g_VFS.reset();
+        DeleteDirectory(DataDir()/"_testcache");
     }
 
     void test_namespace()

source/simulation2/tests/test_Serializer.h

@@ -826 +826 @@
 
         g_VFS = CreateVfs(20 * MiB);
         TS_ASSERT_OK(g_VFS->Mount(L"", DataDir()/"mods"/"public", VFS_MOUNT_MUST_EXIST));
-        TS_ASSERT_OK(g_VFS->Mount(L"cache/", DataDir()/"cache"));
+        TS_ASSERT_OK(g_VFS->Mount(L"cache", DataDir()/"_testcache"));
 
         // Need some stuff for terrain movement costs:
         // (TODO: this ought to be independent of any graphics code)
@@ -879 +879 @@
         // Shut down the world
         delete &g_TexMan;
         g_VFS.reset();
+        DeleteDirectory(DataDir()/"_testcache");
         CXeromyces::Terminate();
     }