diff options
| author | Lukas Larsson <[email protected]> | 2016-02-24 16:18:51 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-04-15 15:07:38 +0200 |
| commit | 5194bb9f0a8fd058f701703e06f2b9be3dce9a91 (patch) | |
| tree | 42c11710cb11d687eeb9d25100a14ff14c02fcc6 /erts/emulator | |
| parent | 17b74ad1f0b7095fd85ee8ffd96e8ff3b59a7e86 (diff) | |
| download | otp-5194bb9f0a8fd058f701703e06f2b9be3dce9a91.tar.gz otp-5194bb9f0a8fd058f701703e06f2b9be3dce9a91.tar.bz2 otp-5194bb9f0a8fd058f701703e06f2b9be3dce9a91.zip | |
erts: Fix end_per_testcase crash in local_trace_SUITE
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/test/trace_local_SUITE.erl | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl index 8901beebca..74c05f24e0 100644 --- a/erts/emulator/test/trace_local_SUITE.erl +++ b/erts/emulator/test/trace_local_SUITE.erl @@ -1224,18 +1224,22 @@ setup(ProcFlags) -> shutdown() -> trace_off(), - {Pid,Mref} = get(slave), - try erlang:is_process_alive(Pid) of - true -> - Pid ! die, - receive - {'DOWN',Mref,process,Pid,Reason} -> - Reason + case get(slave) of + {Pid,Mref} -> + try erlang:is_process_alive(Pid) of + true -> + Pid ! die, + receive + {'DOWN',Mref,process,Pid,Reason} -> + Reason + end; + _ -> + not_alive + catch _:_ -> + undefined end; _ -> - not_alive - catch _:_ -> - undefined + undefined end. trace_off() -> |