aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-03-13 16:21:38 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-03-13 16:21:38 +0100
commit5d95b5ce9eb08f2087443c1be8de8044552daecc (patch)
treedd3d29efe142b6d6b28de259318a7f27b5b43aae /erts
parentee1ad99648316f4dc15d872804dfa52990e0240f (diff)
downloadotp-5d95b5ce9eb08f2087443c1be8de8044552daecc.tar.gz
otp-5d95b5ce9eb08f2087443c1be8de8044552daecc.tar.bz2
otp-5d95b5ce9eb08f2087443c1be8de8044552daecc.zip
erts: Fix os_signal_SUITE test
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/os_signal_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/test/os_signal_SUITE.erl b/erts/emulator/test/os_signal_SUITE.erl
index 9aa49a453e..6bafb0e18c 100644
--- a/erts/emulator/test/os_signal_SUITE.erl
+++ b/erts/emulator/test/os_signal_SUITE.erl
@@ -323,7 +323,10 @@ kill(Signal, Pid) ->
load_nif(Config) ->
Path = proplists:get_value(data_dir, Config),
- ok = erlang:load_nif(filename:join(Path,"os_signal_nif"), 0).
+ case erlang:load_nif(filename:join(Path,"os_signal_nif"), 0) of
+ ok -> ok;
+ {error,{reload,_}} -> ok
+ end.
run(Program0, Args) -> run(".", Program0, Args).
run(Cwd, Program0, Args) when is_list(Cwd) ->