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

4 files changed, 50 insertions, 6 deletions

diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 4218cfa646..e4c8f0ffaf 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -2651,6 +2651,8 @@ symlinks(Config) when is_list(Config) ->
 		?line #file_info{links=1, type=symlink} = Info2,
 		?line {ok, Name} = ?FILE_MODULE:read_link(Alias),
 		{ok, Name} = ?FILE_MODULE:read_link_all(Alias),
+		%% If all is good, delete dir again (avoid hanging dir on windows)
+		rm_rf(?FILE_MODULE,NewDir),
 		ok
 	  end,
     
@@ -4304,3 +4306,18 @@ disc_free(Path) ->
 memsize() ->
     {Tot,_Used,_}  = memsup:get_memory_data(),
     Tot.
+
+%%%-----------------------------------------------------------------
+%%% 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.
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)
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index dac021c6c6..d7d9434b1f 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -211,7 +211,7 @@ job_control_remote(Config) when is_list(Config) ->
 				{sleep,timeout(short)},
 				{putline,""},
 				{getline," -->"},
-				{putline,"r "++MyNode},
+				{putline,"r '"++MyNode++"'"},
 				{putline,"c"},
 				{putline_raw,""},
 				{getline,"Eshell"},
@@ -265,7 +265,7 @@ job_control_remote_noshell(Config) when is_list(Config) ->
 				{sleep,timeout(short)},
 				{putline,""},
 				{getline," -->"},
-				{putline,"r "++NSNodeStr},
+				{putline,"r '"++NSNodeStr++"'"},
 				{putline,"c"},
 				{putline_raw,""},
 				{getline,"Eshell"},
@@ -721,4 +721,4 @@ get_default_shell() ->
     end.
 
 atom2list(A) ->
-    lists:flatten(io_lib:format("~w", [A])).
+    lists:flatten(io_lib:format("~s", [A])).
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.