diff options
| author | Sverker Eriksson <[email protected]> | 2016-09-23 16:03:55 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-09-23 16:03:55 +0200 |
| commit | f145a56e959fb3b2505dc9f3cf9b7be5ade53125 (patch) | |
| tree | e55bcddd3a0904c731e6126136d0862b84c28d2b /erts/emulator/test/trace_nif_SUITE.erl | |
| parent | 7228e3ea97f8e2a19be97740053892e67cc20baf (diff) | |
| parent | a54773f05cd60045a4ac0f9a4ae753aa76185b61 (diff) | |
| download | otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.tar.gz otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.tar.bz2 otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.zip | |
Merge branch 'sverker/remove-nif-reload/OTP-13908'
* sverker/remove-nif-reload:
erts: Cuddle nif_SUITE:consume_timeslice
erts: Remove old doc note for erlang:load_nif
erts: Remove deprecated nif 'reload' feature
erts: Fix trace_nif_SUITE to load nif lib only once
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"). |