diff options
| author | Siri Hansen <[email protected]> | 2013-06-04 11:15:17 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-06-04 11:15:17 +0200 |
| commit | 4a25ec13e624989af191a2297f904df87d8e3248 (patch) | |
| tree | 91432765cf61c01ccd0682075004fb45d4054052 /lib/kernel/test/file_name_SUITE.erl | |
| parent | ca98e0725a3cb604bda6f3ab579dbcdb387dc180 (diff) | |
| parent | a58a2987ab699b452dd1c95dca62147a827e7c7f (diff) | |
| download | otp-4a25ec13e624989af191a2297f904df87d8e3248.tar.gz otp-4a25ec13e624989af191a2297f904df87d8e3248.tar.bz2 otp-4a25ec13e624989af191a2297f904df87d8e3248.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/test/file_name_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/file_name_SUITE.erl | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl index 93a1678cb4..9354af2e41 100644 --- a/lib/kernel/test/file_name_SUITE.erl +++ b/lib/kernel/test/file_name_SUITE.erl @@ -196,7 +196,10 @@ normal(Config) when is_list(Config) -> put(file_module,prim_file), ok = check_normal(prim_file), put(file_module,file), - ok = check_normal(file) + ok = check_normal(file), + %% If all is good, delete dir again (avoid hanging dir on windows) + rm_rf(file,"normal_dir"), + ok after file:set_cwd(Dir) end. @@ -218,7 +221,10 @@ icky(Config) when is_list(Config) -> put(file_module,prim_file), ok = check_icky(prim_file), put(file_module,file), - ok = check_icky(file) + ok = check_icky(file), + %% If all is good, delete dir again (avoid hanging dir on windows) + rm_rf(file,"icky_dir"), + ok after file:set_cwd(Dir) end @@ -242,7 +248,11 @@ very_icky(Config) when is_list(Config) -> {skipped,"VM needs to be started in Unicode filename mode"}; ok -> put(file_module,file), - ok = check_very_icky(file) + ok = check_very_icky(file), + %% If all is good, delete dir again + %% (avoid hanging dir on windows) + rm_rf(file,"very_icky_dir"), + ok end after file:set_cwd(Dir) |