diff options
| author | Siri Hansen <[email protected]> | 2013-06-04 11:06:18 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-06-04 11:06:18 +0200 |
| commit | a58a2987ab699b452dd1c95dca62147a827e7c7f (patch) | |
| tree | 3377b88c5e204ab49bf88cabf4d9525955d4349d /lib/kernel/test/file_name_SUITE.erl | |
| parent | c2151dec9f14707ccaba72cb065824ee61c064a5 (diff) | |
| parent | e0e8b6d2c016d62c8ada8664ec4ba1ce291979d0 (diff) | |
| download | otp-a58a2987ab699b452dd1c95dca62147a827e7c7f.tar.gz otp-a58a2987ab699b452dd1c95dca62147a827e7c7f.tar.bz2 otp-a58a2987ab699b452dd1c95dca62147a827e7c7f.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
Delete 'icky' dirs and symlinks after kernel tests
[ct_netconfc] Improve error printout
Fix interactive_shell_SUITE to handle node name with quotes
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 a6728564e4..0c8082026a 100644 --- a/lib/kernel/test/file_name_SUITE.erl +++ b/lib/kernel/test/file_name_SUITE.erl @@ -197,7 +197,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. @@ -219,7 +222,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 @@ -243,7 +249,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) |