diff options
| author | Sverker Eriksson <[email protected]> | 2016-11-21 19:26:02 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-21 19:26:02 +0100 |
| commit | 160a28a0912cf87e971ddcbfdb6f76d64581fe44 (patch) | |
| tree | 3f0fccc6ad7fb4380d9e6254a1bcc2f99ff2985e /erts | |
| parent | 9491f6727f12e37241863bd5becbd1f336ff7659 (diff) | |
| download | otp-160a28a0912cf87e971ddcbfdb6f76d64581fe44.tar.gz otp-160a28a0912cf87e971ddcbfdb6f76d64581fe44.tar.bz2 otp-160a28a0912cf87e971ddcbfdb6f76d64581fe44.zip | |
erts: Mend broken checks in nif_SUITE
Macro CHECK did not fail the test case
just some nice logging that no one saw.
One ignored failure fixed; a delayed unload
after purge due to live resource with dtor.
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/nif_SUITE.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl index 3a76ee6aee..37d6e68868 100644 --- a/erts/emulator/test/nif_SUITE.erl +++ b/erts/emulator/test/nif_SUITE.erl @@ -21,7 +21,7 @@ -module(nif_SUITE). %%-define(line_trace,true). --define(CHECK(Exp,Got), check(Exp,Got,?LINE)). +-define(CHECK(Exp,Got), Exp = check(Exp,Got,?LINE)). %%-define(CHECK(Exp,Got), Exp = Got). -include_lib("common_test/include/ct.hrl"). @@ -932,7 +932,7 @@ resource_takeover(Config) when is_list(Config) -> ]), ?CHECK([{upgrade,2,1,201}], nif_mod_call_history()), true = erlang:purge_module(nif_mod), - ?CHECK([{unload,1,1,106}], nif_mod_call_history()), + ?CHECK([], nif_mod_call_history()), % BGX2 keeping lib loaded BinA2 = read_resource(0,A2), ok = forget_resource(A2), @@ -945,8 +945,8 @@ resource_takeover(Config) when is_list(Config) -> ?CHECK([], nif_mod_call_history()), % no dtor ok = forget_resource(BGX2), % calling dtor in orphan library v1 still loaded - ?CHECK([{{resource_dtor_B_v1,BinBGX2},1,6,106}], nif_mod_call_history()), - % How to test that lib v1 is closed here? + ?CHECK([{{resource_dtor_B_v1,BinBGX2},1,6,106}, {unload,1,7,107}], + nif_mod_call_history()), ok = forget_resource(NGX2), ?CHECK([], nif_mod_call_history()), % no dtor @@ -1900,7 +1900,8 @@ check(Exp,Got,Line) -> case Got of Exp -> Exp; _ -> - io:format("CHECK at ~p: Expected ~p but got ~p\n",[Line,Exp,Got]), + io:format("CHECK at line ~p\nExpected: ~p\nGot : ~p\n", + [Line,Exp,Got]), Got end. |