aboutsummaryrefslogtreecommitdiffstats
path: root/lib/observer/test/crashdump_viewer_SUITE.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-03-02 09:39:33 +0100
committerSiri Hansen <[email protected]>2016-03-02 09:39:33 +0100
commitd0a4ed3dbc5e6bd92253ced1ed31720fae1e9411 (patch)
tree309a8b7d453beb691e914ee7788202a819bb5bb8 /lib/observer/test/crashdump_viewer_SUITE.erl
parente1489c448b7486cdcfec6a89fea238d88e6ce2f3 (diff)
parent51349126632b3ce589f217abe5dcfb7b1e47faa1 (diff)
downloadotp-d0a4ed3dbc5e6bd92253ced1ed31720fae1e9411.tar.gz
otp-d0a4ed3dbc5e6bd92253ced1ed31720fae1e9411.tar.bz2
otp-d0a4ed3dbc5e6bd92253ced1ed31720fae1e9411.zip
Merge branch 'siri/crashdump-dir/OTP-13388' into maint
* siri/crashdump-dir/OTP-13388: Set dir for slave node's erl_crash.dump
Diffstat (limited to 'lib/observer/test/crashdump_viewer_SUITE.erl')
-rw-r--r--lib/observer/test/crashdump_viewer_SUITE.erl19
1 files changed, 4 insertions, 15 deletions
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 84af440245..eae4ee01b9 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -564,22 +564,11 @@ dump_with_strange_module_name(DataDir,Rel,DumpName) ->
CD.
dump(Node,DataDir,Rel,DumpName) ->
+ Crashdump = filename:join(DataDir, dump_prefix(Rel)++DumpName),
+ rpc:call(Node,os,putenv,["ERL_CRASH_DUMP",Crashdump]),
rpc:call(Node,erlang,halt,[DumpName]),
- Crashdump0 = filename:join(filename:dirname(code:which(?t)),
- "erl_crash_dump.n1"),
- Crashdump1 = filename:join(DataDir, dump_prefix(Rel)++DumpName),
- ok = rename(Crashdump0,Crashdump1),
- Crashdump1.
-
-rename(From,To) ->
- ok = check_complete(From),
- case file:rename(From,To) of
- {error,exdev} ->
- {ok,_} = file:copy(From,To),
- ok = file:delete(From);
- ok ->
- ok
- end.
+ ok = check_complete(Crashdump),
+ Crashdump.
check_complete(File) ->
check_complete1(File,10).