Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix the cache directory appearing during tests.

Browse Source 
Summary: Refs #4419.

Test Plan: When running tests, make sure nothing is created.

Reviewers: leper

Reviewed By: leper
Subscribers: leper, Vulcan

Differential Revision: https://code.wildfiregames.com/D1
This was SVN commit r19062.
This commit is contained in:
Nicolas Auvray 2016-12-25 22:03:30 +00:00
parent e39d86769a
commit 490a3a27f6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/simulation2/components/tests/test_Pathfinder.h
View File

@ -37,7 +37,7 @@ public:
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,6 +52,7 @@ public:
delete &g_TexMan;
CXeromyces::Terminate();
g_VFS.reset();
DeleteDirectory(DataDir()/"_testcache");
}
void test_namespace()

3
source/simulation2/tests/test_Serializer.h
View File

@ -826,7 +826,7 @@ public:
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,6 +879,7 @@ public:
// Shut down the world
delete &g_TexMan;
g_VFS.reset();
DeleteDirectory(DataDir()/"_testcache");
CXeromyces::Terminate();
}