diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-09 10:26:28 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-09 10:26:28 +0100 |
| commit | 21e395b93eafe68544b7ee5dd186c01bcfc5d02e (patch) | |
| tree | 2edba65235d8c1da4aa08e34f2c8343e54b5a735 /lib/common_test/src/test_server_sup.erl | |
| parent | fa86be90274abf69451007db04fd4d21257c1843 (diff) | |
| parent | b68ec56d44ff7f94289670ca0f10c8bbce927be5 (diff) | |
| download | otp-21e395b93eafe68544b7ee5dd186c01bcfc5d02e.tar.gz otp-21e395b93eafe68544b7ee5dd186c01bcfc5d02e.tar.bz2 otp-21e395b93eafe68544b7ee5dd186c01bcfc5d02e.zip | |
Merge branch 'maint'
* maint:
io_SUITE: Don't fail on fast computers with rough timers
Fix code_SUITE after test_server change
Set default value for crash_dump_dir
Diffstat (limited to 'lib/common_test/src/test_server_sup.erl')
| -rw-r--r-- | lib/common_test/src/test_server_sup.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/common_test/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl index 1c0eb18d70..c4530ba62f 100644 --- a/lib/common_test/src/test_server_sup.erl +++ b/lib/common_test/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() -> |