Set dir for slave node's erl_crash.dump

This was earlier filename:dirname(code:which(test_server)). On
Microsoft Windows, this pointed to a directory under c:/Program Files,
and in later versions this directory is no longer writable. The
framework (common_test) log dir is now used instead.

4 files changed, 8 insertions, 11 deletions

diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 73803030a3..671674c617 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -63,13 +63,11 @@
 init_target_info() ->
     [$.|Emu] = code:objfile_extension(),
     {_, OTPRel} = init:script_id(),
-    TestServerDir = filename:absname(filename:dirname(code:which(?MODULE))),
     #target_info{os_family=test_server_sup:get_os_family(),
 		 os_type=os:type(),
 		 version=erlang:system_info(version),
 		 system_version=erlang:system_info(system_version),
 		 root_dir=code:root_dir(),
-		 test_server_dir=TestServerDir,
 		 emulator=Emu,
 		 otp_release=OTPRel,
 		 username=test_server_sup:get_username(),
diff --git a/lib/test_server/src/test_server_internal.hrl b/lib/test_server/src/test_server_internal.hrl
index 578f359010..1ec2d83417 100644
--- a/lib/test_server/src/test_server_internal.hrl
+++ b/lib/test_server/src/test_server_internal.hrl
@@ -30,7 +30,6 @@
 		      version,         % string()
 		      system_version,  % string()
 		      root_dir,        % string()
-		      test_server_dir, % string()
 		      emulator,        % string()
 		      otp_release,     % string()
 		      username,        % string()
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index 70cc2625d4..37f8941d24 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -307,11 +307,11 @@ start_node_peer(SlaveName, OptList, From, TI) ->
 				      HostStr, " ", WaitPort]),
 
     % Support for erl_crash_dump files..
-    CrashFile = filename:join([TI#target_info.test_server_dir,
+    CrashDir = test_server_sup:crash_dump_dir(),
+    CrashFile = filename:join([CrashDir,
 			       "erl_crash_dump."++cast_to_list(SlaveName)]),
     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),
     Prog = quote_progname(pick_erl_program(Prog0)),
     Args = 
@@ -322,7 +322,6 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     Cmd = lists:concat([Prog,
 			" -detached ",
 			TI#target_info.naming, " ", SlaveName,
-			" -pa \"", Pa,"\"",
 			NodeStarted,
 			CrashArgs,
 			" ", Args]),
@@ -370,15 +369,15 @@ wait_for_node_started_fun(LSock, Tmo, Cleanup, TI, Self) ->
 %% Slave nodes are started on a remote host if
 %% - the option remote is given when calling test_server:start_node/3
 %%
-start_node_slave(SlaveName, OptList, From, TI) ->
+start_node_slave(SlaveName, OptList, From, _TI) ->
     SuppliedArgs = start_node_get_option_value(args, OptList, []),
     Cleanup = start_node_get_option_value(cleanup, OptList, true),
 
-    CrashFile = filename:join([TI#target_info.test_server_dir,
+    CrashDir = test_server_sup:crash_dump_dir(),
+    CrashFile = filename:join([CrashDir,
 			       "erl_crash_dump."++cast_to_list(SlaveName)]),
     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([" ", SuppliedArgs, CrashArgs]),
 
     Prog0 = start_node_get_option_value(erl, OptList, default),
     Prog = pick_erl_program(Prog0),
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index fc2cfd57bd..1c0eb18d70 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -594,7 +594,8 @@ cleanup_crash_dumps() ->
     delete_files(Dumps).
 
 crash_dump_dir() ->
-    filename:dirname(code:which(?MODULE)).
+    {ok,Dir} = test_server_sup:framework_call(get_log_dir,[]),
+    Dir.
 
 tar_crash_dumps() ->
     Dir = crash_dump_dir(),