diff options
| author | Sverker Eriksson <[email protected]> | 2016-09-12 15:05:47 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-09-15 12:06:22 +0200 |
| commit | 7262d8630998517e97ec62a7e0d9cbdd23fdd9c8 (patch) | |
| tree | b39b3d34bf4568e42f6aae3ea0ac5b5c25de6a69 /erts | |
| parent | 687eae1e86817403249f03f534a256a28c5d5251 (diff) | |
| download | otp-7262d8630998517e97ec62a7e0d9cbdd23fdd9c8.tar.gz otp-7262d8630998517e97ec62a7e0d9cbdd23fdd9c8.tar.bz2 otp-7262d8630998517e97ec62a7e0d9cbdd23fdd9c8.zip | |
erts: Fix trace_nif_SUITE to load nif lib only once
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/trace_nif_SUITE.erl | 12 | ||||
| -rw-r--r-- | erts/emulator/test/trace_nif_SUITE_data/trace_nif.c | 11 |
2 files changed, 15 insertions, 8 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"). diff --git a/erts/emulator/test/trace_nif_SUITE_data/trace_nif.c b/erts/emulator/test/trace_nif_SUITE_data/trace_nif.c index 26f2420b8b..0c29ff8da8 100644 --- a/erts/emulator/test/trace_nif_SUITE_data/trace_nif.c +++ b/erts/emulator/test/trace_nif_SUITE_data/trace_nif.c @@ -6,18 +6,18 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) return 0; } -static int reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) +static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info) { return 0; } -static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info) +static void unload(ErlNifEnv* env, void* priv_data) { - return 0; } -static void unload(ErlNifEnv* env, void* priv_data) +static ERL_NIF_TERM is_nif_loaded(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { + return enif_make_atom(env,"true"); } static ERL_NIF_TERM nif_0(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) @@ -38,9 +38,10 @@ static ERL_NIF_TERM nif_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) static ErlNifFunc nif_funcs[] = { + {"is_nif_loaded", 0, is_nif_loaded}, {"nif", 0, nif_0}, {"nif", 1, nif_1} }; -ERL_NIF_INIT(trace_nif_SUITE,nif_funcs,load,reload,upgrade,unload) +ERL_NIF_INIT(trace_nif_SUITE,nif_funcs,load,NULL,upgrade,unload) |