aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server_sup.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-03-09 10:11:19 +0100
committerSiri Hansen <[email protected]>2016-03-09 10:11:19 +0100
commit00a0a2d227be215741264030b929c1fc7b7473d5 (patch)
treec51689b5469bf270796b15728cb1542d93c75d9c /lib/test_server/src/test_server_sup.erl
parentaafb2506a85b1bad11157f9786f2a834c9d76fae (diff)
parentf0046c37852993bde960c3a456c1ac1c0078d792 (diff)
downloadotp-00a0a2d227be215741264030b929c1fc7b7473d5.tar.gz
otp-00a0a2d227be215741264030b929c1fc7b7473d5.tar.bz2
otp-00a0a2d227be215741264030b929c1fc7b7473d5.zip
Merge branch 'siri/crashdump-dir/OTP-13388' into maint
* siri/crashdump-dir/OTP-13388: Fix code_SUITE after test_server change Set default value for crash_dump_dir
Diffstat (limited to 'lib/test_server/src/test_server_sup.erl')
-rw-r--r--lib/test_server/src/test_server_sup.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 1c0eb18d70..c4530ba62f 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -594,7 +594,10 @@ cleanup_crash_dumps() ->
delete_files(Dumps).
crash_dump_dir() ->
- {ok,Dir} = test_server_sup:framework_call(get_log_dir,[]),
+ %% If no framework is known, then we use current working directory
+ %% - in most cases that will be the same as the default log
+ %% directory.
+ {ok,Dir} = test_server_sup:framework_call(get_log_dir,[],file:get_cwd()),
Dir.
tar_crash_dumps() ->