maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libcxx] [test] Don't leave test dirs behind in fs.op.current_path on Windows 

Fix nesting of static_env and CWDGuard, restore the cwd (with
CWDGuard) before cleaning up the static_env.

Previously, every test run left 2 directories behind in the temp dir.

Differential Revision: https://reviews.llvm.org/D98954
This commit is contained in:
Martin Storsjö 2021-03-19 16:54:37 +02:00
parent eb26afbafe
commit 4c402ae880
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.current_path/current_path.pass.cpp
View File

@ -51,8 +51,8 @@ TEST_CASE(current_path_test)
TEST_CASE(current_path_after_change_test)
{
CWDGuard guard;
static_test_env static_env;
CWDGuard guard;
const path new_path = static_env.Dir;
current_path(new_path);
TEST_CHECK(current_path() == new_path);
@ -60,8 +60,8 @@ TEST_CASE(current_path_after_change_test)
TEST_CASE(current_path_is_file_test)
{
CWDGuard guard;
static_test_env static_env;
CWDGuard guard;
const path p = static_env.File;
std::error_code ec;
const path old_p = current_path();
@ -72,8 +72,8 @@ TEST_CASE(current_path_is_file_test)
TEST_CASE(set_to_non_absolute_path)
{
CWDGuard guard;
static_test_env static_env;
CWDGuard guard;
const path base = static_env.Dir;
current_path(base);
const path p = static_env.Dir2.filename();