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/prim_file_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/prim_file_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/prim_file_SUITE.erl | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl index ac75037536..199e597e78 100644 --- a/lib/kernel/test/prim_file_SUITE.erl +++ b/lib/kernel/test/prim_file_SUITE.erl @@ -2039,6 +2039,8 @@ symlinks(Config, Handle, Suffix) -> ?PRIM_FILE_call(read_link, Handle, [Alias]), {ok, Name} = ?PRIM_FILE_call(read_link_all, Handle, [Alias]), + %% If all is good, delete dir again (avoid hanging dir on windows) + rm_rf(?PRIM_FILE,NewDir), ok end, @@ -2245,3 +2247,18 @@ zip_data([], Bs) -> Bs; zip_data(As, []) -> As. + +%%%----------------------------------------------------------------- +%%% Utilities +rm_rf(Mod,Dir) -> + case Mod:read_link_info(Dir) of + {ok, #file_info{type = directory}} -> + {ok, Content} = Mod:list_dir_all(Dir), + [ rm_rf(Mod,filename:join(Dir,C)) || C <- Content ], + Mod:del_dir(Dir), + ok; + {ok, #file_info{}} -> + Mod:delete(Dir); + _ -> + ok + end. |