diff options
| author | Sverker Eriksson <[email protected]> | 2010-11-24 18:17:33 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2010-11-24 18:17:33 +0100 |
| commit | e15ad4355d1fcbc73454ebc3ce8350a2c9f05069 (patch) | |
| tree | 515d8eeabe2c9e78e931e901e0d62247288a23d5 /erts | |
| parent | ba4e0b4471bfcd748499bd035b5afac058104b5f (diff) | |
| parent | b9b96221a6ecb1f0fff06e842045e744bd6bd055 (diff) | |
| download | otp-e15ad4355d1fcbc73454ebc3ce8350a2c9f05069.tar.gz otp-e15ad4355d1fcbc73454ebc3ce8350a2c9f05069.tar.bz2 otp-e15ad4355d1fcbc73454ebc3ce8350a2c9f05069.zip | |
Merge branch 'sverker/crypto_aes_ctr_cmac/OTP-8752' into dev
* sverker/crypto_aes_ctr_cmac/OTP-8752:
Fix nif_SUITE to not assume that it is the only one loading NIFs.
crypto CTR support
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/nif_SUITE.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl index f45cfa3e4a..42947aa6be 100644 --- a/erts/emulator/test/nif_SUITE.erl +++ b/erts/emulator/test/nif_SUITE.erl @@ -73,7 +73,7 @@ basic(Config) when is_list(Config) -> ?line true = (lib_version() =/= undefined), ?line [{load,1,1,101},{lib_version,1,2,102}] = call_history(), ?line [] = call_history(), - ?line [?MODULE] = erlang:system_info(taints), + ?line true = lists:member(?MODULE, erlang:system_info(taints)), ok. reload(doc) -> ["Test reload callback in nif lib"]; @@ -107,7 +107,8 @@ reload(Config) when is_list(Config) -> ?line true = erlang:purge_module(nif_mod), ?line [{unload,1,3,103}] = nif_mod_call_history(), - ?line [?MODULE, nif_mod] = erlang:system_info(taints), + ?line true = lists:member(?MODULE, erlang:system_info(taints)), + ?line true = lists:member(nif_mod, erlang:system_info(taints)), ?line verify_tmpmem(TmpMem), ok. @@ -197,7 +198,8 @@ upgrade(Config) when is_list(Config) -> ?line true = erlang:purge_module(nif_mod), ?line [{unload,2,4,204}] = nif_mod_call_history(), - ?line [?MODULE, nif_mod] = erlang:system_info(taints), + ?line true = lists:member(?MODULE, erlang:system_info(taints)), + ?line true = lists:member(nif_mod, erlang:system_info(taints)), ?line verify_tmpmem(TmpMem), ok. @@ -727,7 +729,8 @@ resource_takeover(Config) when is_list(Config) -> ?line ok = forget_resource(AN4), ?line [] = nif_mod_call_history(), - ?line [?MODULE, nif_mod] = erlang:system_info(taints), + ?line true = lists:member(?MODULE, erlang:system_info(taints)), + ?line true = lists:member(nif_mod, erlang:system_info(taints)), ?line verify_tmpmem(TmpMem), ok. |