Update to work with whitespace in exec path

OTP-10106
OTP-10107

6 files changed, 45 insertions, 38 deletions

diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
index 4bc51873c2..a75855eaab 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -124,22 +124,22 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELEASE_PATH)/test_server
+	$(INSTALL_DIR) "$(RELEASE_PATH)/test_server"
 	$(INSTALL_DATA) $(ERL_FILES) $(TS_ERL_FILES) \
 		$(HRL_FILES) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) \
 		$(TS_TARGET_FILES) \
 		$(AUTOCONF_FILES) $(C_FILES) $(COVER_FILES) $(CONFIG) \
-		$(RELEASE_PATH)/test_server
-	$(INSTALL_SCRIPT) $(PROGRAMS) $(RELEASE_PATH)/test_server
+		"$(RELEASE_PATH)/test_server"
+	$(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server"
 
 release_docs_spec:
 
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index e8498a43f2..6358efa764 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -407,7 +407,7 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     % Support for erl_crash_dump files..
     CrashFile = filename:join([TI#target_info.test_server_dir,
 			       "erl_crash_dump."++cast_to_list(SlaveName)]),
-    CrashArgs = lists:concat([" -env ERL_CRASH_DUMP ",CrashFile," "]),
+    CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]),
     FailOnError = start_node_get_option_value(fail_on_error, OptList, true),
     Pa = TI#target_info.test_server_dir,
     Prog0 = start_node_get_option_value(erl, OptList, default),
@@ -420,7 +420,7 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     Cmd = lists:concat([Prog,
 			" -detached ",
 			TI#target_info.naming, " ", SlaveName,
-			" -pa ", Pa,
+			" -pa \"", Pa,"\"",
 			NodeStarted,
 			CrashArgs,
 			" ", Args]),
@@ -472,9 +472,9 @@ start_node_slave(SlaveName, OptList, From, TI) ->
 
     CrashFile = filename:join([TI#target_info.test_server_dir,
 			       "erl_crash_dump."++cast_to_list(SlaveName)]),
-    CrashArgs = lists:concat([" -env ERL_CRASH_DUMP ",CrashFile," "]),
+    CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]),
     Pa = TI#target_info.test_server_dir,
-    Args = lists:concat([" -pa ", Pa, " ", SuppliedArgs, CrashArgs]),
+    Args = lists:concat([" -pa \"", Pa, "\" ", SuppliedArgs, CrashArgs]),
 
     Prog0 = start_node_get_option_value(erl, OptList, default),
     Prog = pick_erl_program(Prog0),
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl
index ed26156180..45d88016a4 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/test_server/src/ts_erl_config.erl
@@ -128,15 +128,15 @@ erts_lib(Vars,OsType) ->
 		   ErtsLibInternal}
 	  end,
     [{erts_lib_include,
-      filename:nativename(ErtsLibInclude)},
+      quote(filename:nativename(ErtsLibInclude))},
      {erts_lib_include_generated,
-      filename:nativename(ErtsLibIncludeGenerated)},
+      quote(filename:nativename(ErtsLibIncludeGenerated))},
      {erts_lib_include_internal,
-      filename:nativename(ErtsLibIncludeInternal)},
+      quote(filename:nativename(ErtsLibIncludeInternal))},
      {erts_lib_include_internal_generated,
-      filename:nativename(ErtsLibIncludeInternalGenerated)},
-     {erts_lib_path, filename:nativename(ErtsLibPath)},
-     {erts_lib_internal_path, filename:nativename(ErtsLibInternalPath)},
+      quote(filename:nativename(ErtsLibIncludeInternalGenerated))},
+     {erts_lib_path, quote(filename:nativename(ErtsLibPath))},
+     {erts_lib_internal_path, quote(filename:nativename(ErtsLibInternalPath))},
      {erts_lib_multi_threaded, erts_lib_name(multi_threaded, OsType)},
      {erts_lib_single_threaded, erts_lib_name(single_threaded, OsType)}
      | Vars].
@@ -145,13 +145,13 @@ erl_include(Vars) ->
     Include = 
 	case erl_root(Vars) of
 	    {installed, Root} ->
-		filename:join([Root, "usr", "include"]);
+		quote(filename:join([Root, "usr", "include"]));
 	    {srctree, Root, Target} ->
-		filename:join([Root, "erts", "emulator", "beam"])
-		    ++ " -I" ++ filename:join([Root, "erts", "emulator"])
+		quote(filename:join([Root, "erts", "emulator", "beam"]))
+		    ++ " -I" ++ quote(filename:join([Root, "erts", "emulator"]))
 		    ++ system_include(Root, Vars)
-		    ++ " -I" ++ filename:join([Root, "erts", "include"])
-		    ++ " -I" ++ filename:join([Root, "erts", "include", Target])
+		    ++ " -I" ++ quote(filename:join([Root, "erts", "include"]))
+		    ++ " -I" ++ quote(filename:join([Root, "erts", "include", Target]))
 	end,
     [{erl_include, filename:nativename(Include)}|Vars].
 
@@ -163,7 +163,7 @@ system_include(Root, Vars) ->
 	    "VxWorks" -> "sys.vxworks";
 	    _ -> "sys/unix"
 	end,
-    " -I" ++ filename:nativename(filename:join([Root, "erts", "emulator", SysDir])).
+    " -I" ++ quote(filename:nativename(filename:join([Root, "erts", "emulator", SysDir]))).
 
 erl_interface(Vars,OsType) ->
     {Incl, {LibPath, MkIncl}} =
@@ -220,15 +220,15 @@ erl_interface(Vars,OsType) ->
 		    _ -> 
 			"" % VxWorks
 		end,
-    [{erl_interface_libpath, filename:nativename(LibPath)},
+    [{erl_interface_libpath, quote(filename:nativename(LibPath))},
      {erl_interface_sock_libs, sock_libraries(OsType)},
      {erl_interface_lib, Lib},
      {erl_interface_eilib, Lib1},
      {erl_interface_lib_drv, LibDrv},
      {erl_interface_eilib_drv, Lib1Drv},
      {erl_interface_threadlib, ThreadLib},
-     {erl_interface_include, filename:nativename(Incl)},
-     {erl_interface_mk_include, filename:nativename(MkIncl)}
+     {erl_interface_include, quote(filename:nativename(Incl))},
+     {erl_interface_mk_include, quote(filename:nativename(MkIncl))}
      | Vars].
 
 ic(Vars, OsType) ->
@@ -246,10 +246,10 @@ ic(Vars, OsType) ->
 		 end,
 		 filename:join(Dir, "include")}
 	end,
-    [{ic_classpath, filename:nativename(ClassPath)},
-     {ic_libpath, filename:nativename(LibPath)},
+    [{ic_classpath, quote(filename:nativename(ClassPath))},
+     {ic_libpath, quote(filename:nativename(LibPath))},
      {ic_lib, link_library("ic", OsType)},
-     {ic_include_path, filename:nativename(Incl)}|Vars].
+     {ic_include_path, quote(filename:nativename(Incl))}|Vars].
 
 jinterface(Vars, _OsType) ->
     ClassPath =
@@ -259,7 +259,7 @@ jinterface(Vars, _OsType) ->
 	    Dir ->
 		filename:join([Dir, "priv", "OtpErlang.jar"])
 	end,
-    [{jinterface_classpath, filename:nativename(ClassPath)}|Vars].
+    [{jinterface_classpath, quote(filename:nativename(ClassPath))}|Vars].
 
 lib_dir(Vars, Lib) ->
     LibLibDir = case Lib of
@@ -354,10 +354,17 @@ ssl(Vars, _OsType) ->
 	{error, bad_name} ->
 	    throw({cannot_find_app, ssl});
 	Dir ->
-	    [{ssl_libdir, filename:nativename(Dir)}| Vars]
+	    [{ssl_libdir, quote(filename:nativename(Dir))}| Vars]
     end.
 
 separators(Vars, {win32,_}) ->
     [{'DS',"\\"},{'PS',";"}|Vars];
 separators(Vars, _) ->
     [{'DS',"/"},{'PS',":"}|Vars].
+
+quote([$ |R]) ->
+    "\\ "++quote(R);
+quote([C|R]) ->
+    [C|quote(R)];
+quote([]) ->
+    [].
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index c70a41be4b..46d912280a 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -132,7 +132,7 @@ unix_autoconf(XConf) ->
 	    OSXEnv = macosx_cflags(),
 	    io:format("Running ~sEnv: ~p~n",
 		      [lists:flatten(Configure ++ Args),Env++OSXEnv]),
-	    Port = open_port({spawn, lists:flatten(Configure ++ Args)},
+	    Port = open_port({spawn, lists:flatten(["\"",Configure,"\"",Args])},
 			     [stream, eof, {env,Env++OSXEnv}]),
 	    ts_lib:print_data(Port);
 	false ->
diff --git a/lib/test_server/src/ts_make.erl b/lib/test_server/src/ts_make.erl
index f0db60013a..1d8ef230c7 100644
--- a/lib/test_server/src/ts_make.erl
+++ b/lib/test_server/src/ts_make.erl
@@ -85,7 +85,7 @@ run_make_script({win32, _}, Make, Dir, Makefile) ->
     {"run_make.bat",
      ".\\run_make",
      ["@echo off\r\n",
-      "cd ", filename:nativename(Dir), "\r\n",
+      "cd \"", filename:nativename(Dir), "\"\r\n",
       Make, " -f ", Makefile, " \r\n",
       "if errorlevel 1 echo *error*\r\n",
       "if not errorlevel 1 echo *ok*\r\n"]};
@@ -93,7 +93,7 @@ run_make_script({unix, _}, Make, Dir, Makefile) ->
     {"run_make", 
      "/bin/sh ./run_make",
      ["#!/bin/sh\n",
-      "cd ", Dir, "\n",
+      "cd \"", Dir, "\"\n",
       Make, " -f ", Makefile, " 2>&1\n",
       "case $? in\n",
       "  0) echo '*ok*';;\n",
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index 885a3c9b96..a61028e4bc 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -229,7 +229,7 @@ make_command(Vars, Spec, State) ->
 	   %% uncomment the line below to disable exception formatting 
 	   %%	   " -test_server_format_exception false",
 	   " -boot start_sasl -sasl errlog_type error",
-	   " -pz ",Cwd,
+	   " -pz \"",Cwd,"\"",
 	   " -ct_test_vars ",TestVars,
 	   " -eval \"file:set_cwd(\\\"",TestDir,"\\\")\" "
 	   " -eval \"ct:run_test(",