Merge branch 'lukas/otp/install_with_whitespace/OTP-10107' into maint

* lukas/otp/install_with_whitespace/OTP-10107:
  Update to work with space in include path
  Update to work with whitespace in exec path

4 files changed, 14 insertions, 14 deletions

diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 5dcaad3f5e..7bb3e3a365 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -140,12 +140,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(APP_FILES) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(APP_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) kernel.spec  $(EMAKEFILE)\
-		$(COVERFILE) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+		$(COVERFILE) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 2c59351600..3e8bdaf1ff 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -501,7 +501,7 @@ sticky_dir(doc) -> ["Test that a module with the same name as a module in ",
 		    "a sticky directory cannot be loaded."];
 sticky_dir(Config) when is_list(Config) ->
     MyDir=filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node}=?t:start_node(sticky_dir, slave,[{args, "-pa "++MyDir}]),
+    ?line {ok, Node}=?t:start_node(sticky_dir, slave,[{args, "-pa \""++MyDir++"\""}]),
     File=filename:join([?config(data_dir, Config), "calendar"]),
     ?line Ret=rpc:call(Node, ?MODULE, sticky_compiler, [File]),
     case Ret of
@@ -822,7 +822,7 @@ load_cached(Config) when is_list(Config) ->
     ?line WD = filename:dirname(code:which(?MODULE)),
     ?line {ok,Node} = 
 	?t:start_node(code_cache_node, peer, [{args,
-					       "-pa " ++ WD},
+					       "-pa \"" ++ WD ++ "\""},
 					      {erl, [this]}]),
     CCTabCreated = fun(Tab) ->
 			   case ets:info(Tab, name) of
@@ -907,7 +907,7 @@ add_and_rehash(Config) when is_list(Config) ->
     ?line WD = filename:dirname(code:which(?MODULE)),
     ?line {ok,Node} = 
 	?t:start_node(code_cache_node, peer, [{args,
-					       "-pa " ++ WD},
+					       "-pa \"" ++ WD ++ "\""},
 					      {erl, [this]}]),
     CCTabCreated = fun(Tab) ->
 			   case ets:info(Tab, name) of
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index b39fadd65f..e3fa4642b7 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -608,7 +608,7 @@ boot2(Config) when is_list(Config) ->
 	    %% Absolute boot file name
 	    Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
 
-	    Args = args() ++ " -boot " ++ Boot,
+	    Args = args() ++ " -boot \"" ++ Boot++"\"",
 	    ?line {ok, Node} = start_node(init_test, Args),
 	    ?line stop_node(Node),
 
@@ -618,7 +618,7 @@ boot2(Config) when is_list(Config) ->
 		    %% converted to backslashes.
 		    Win_boot = lists:map(fun($/) -> $\\; (C) -> C end,
 					 Boot),
-		    Args2 = args() ++ " -boot " ++ Win_boot,
+		    Args2 = args() ++ " -boot \"" ++ Win_boot ++ "\"",
 		    ?line {ok, Node2} = start_node(init_test, Args2),
 		    ?line stop_node(Node2);
 		_ ->
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index b2308dd321..96e45cc23f 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -251,7 +251,7 @@ rtnode(Commands,Nodename,ErlPrefix) ->
 				?line {skip, Reason2};
 			    Tempdir ->
 				?line SPid = 
-				    start_runerl_node(RunErl,ErlPrefix++Erl,
+				    start_runerl_node(RunErl,ErlPrefix++"\\\""++Erl++"\\\"",
 						      Tempdir,Nodename),
 				?line CPid = start_toerl_server(ToErl,Tempdir),
 				?line erase(getline_skipped),
@@ -487,7 +487,7 @@ start_runerl_node(RunErl,Erl,Tempdir,Nodename) ->
 		       " -setcookie "++atom_to_list(erlang:get_cookie())
 	   end,
     spawn(fun() ->
-		  os:cmd(RunErl++" "++Tempdir++"/ "++Tempdir++" \""++
+		  os:cmd("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++" \""++
 			 Erl++XArg++"\"")
 	  end).
 
@@ -518,7 +518,7 @@ try_to_erl(Command, N) ->
     end.
 
 toerl_server(Parent,ToErl,Tempdir) ->
-    Port = try_to_erl(ToErl++" "++Tempdir++"/ 2>/dev/null",8),
+    Port = try_to_erl("\""++ToErl++"\" "++Tempdir++"/ 2>/dev/null",8),
     case Port of
 	P when is_port(P) ->
 	    Parent ! {self(),started};