aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-06-03 17:47:34 +0200
committerSiri Hansen <[email protected]>2013-06-03 17:47:34 +0200
commitb81d9bf18cd99b60f4bd964f190f63673e0a9b6b (patch)
tree310d4b1fe239ecf30bf46b5c5c1a3102500501d5 /lib
parent9365954de6a3be7c76998ccf7caab50bf12c55c2 (diff)
downloadotp-b81d9bf18cd99b60f4bd964f190f63673e0a9b6b.tar.gz
otp-b81d9bf18cd99b60f4bd964f190f63673e0a9b6b.tar.bz2
otp-b81d9bf18cd99b60f4bd964f190f63673e0a9b6b.zip
[sasl] Remove priv dir after release_handler_SUITE
Since introducing unicode paths, the name of the priv_dir will include "unicode characters" and on some platforms (e.g. Windows) these are not so easily removed by the daily cleanup scripts. To avoid lingering directories, the priv_dir is now completly removed by the suite itself (unless there are failed testcases and logs must be saved).
Diffstat (limited to 'lib')
-rw-r--r--lib/sasl/test/release_handler_SUITE.erl10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 816dc7b36c..b73691310f 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -35,7 +35,8 @@ init_per_suite(Config) ->
application:start(sasl),
Config.
-end_per_suite(_Config) ->
+end_per_suite(Config) ->
+ clean_priv_dir(Config,true),
ok.
all() ->
@@ -163,7 +164,6 @@ end_per_group(release, Config) ->
{win32,_} -> delete_all_services();
_ -> ok
end,
- clean_priv_dir(Config,true),
?t:timetrap_cancel(Dog),
Config;
end_per_group(_GroupName, Config) ->
@@ -1962,7 +1962,11 @@ copy_client(Conf,Master,Sname,Client) ->
clean_priv_dir(Conf,Save) ->
PrivDir = priv_dir(Conf),
- rh_test_lib:clean_dir(PrivDir,Save).
+ rh_test_lib:clean_dir(PrivDir,Save),
+ case file:list_dir(PrivDir) of
+ {ok,[]} -> _ = file:del_dir(PrivDir);
+ _ -> ok
+ end.
node_name(Sname) when is_atom(Sname) ->
{ok,Host} = inet:gethostname(),