diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-26 17:37:35 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-26 17:37:35 +0200 |
| commit | 42b9881d075344344a8c78026e282b40fa707a0c (patch) | |
| tree | d9755627cee82a99eff6755c8f092ed45dd7a71e /erts/emulator/test/trace_nif_SUITE.erl | |
| parent | 6408400fc1ca9609169f6a0450f1c4671aced91c (diff) | |
| parent | 1302b09c4aa0f944bdc0e3beeebb2cf84cc06c89 (diff) | |
| download | otp-42b9881d075344344a8c78026e282b40fa707a0c.tar.gz otp-42b9881d075344344a8c78026e282b40fa707a0c.tar.bz2 otp-42b9881d075344344a8c78026e282b40fa707a0c.zip | |
Merge branch 'master' into sverker/hipe-fun-purge
Diffstat (limited to 'erts/emulator/test/trace_nif_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/trace_nif_SUITE.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/erts/emulator/test/trace_nif_SUITE.erl b/erts/emulator/test/trace_nif_SUITE.erl index 8d5bff2a48..7ac6fce234 100644 --- a/erts/emulator/test/trace_nif_SUITE.erl +++ b/erts/emulator/test/trace_nif_SUITE.erl @@ -265,10 +265,16 @@ nif_process() -> nif_process(). load_nif(Config) -> - Path = proplists:get_value(data_dir, Config), - - ok = erlang:load_nif(filename:join(Path,"trace_nif"), 0). + case is_nif_loaded() of + true -> + ok; + false -> + Path = proplists:get_value(data_dir, Config), + ok = erlang:load_nif(filename:join(Path,"trace_nif"), 0) + end. +is_nif_loaded() -> + false. nif() -> {"Stub0",[]}. %exit("nif/0 stub called"). |