aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-04-14 15:18:33 +0200
committerSverker Eriksson <[email protected]>2015-04-15 19:02:13 +0200
commit80e15112a6e31e053ad0670096c23bda2fc341e4 (patch)
tree4d4b9778720962a7c13f40fc002bfa993b847e54 /erts/emulator/test
parent9f903f6031ff40e415c8807aca19f699d0b553f1 (diff)
downloadotp-80e15112a6e31e053ad0670096c23bda2fc341e4.tar.gz
otp-80e15112a6e31e053ad0670096c23bda2fc341e4.tar.bz2
otp-80e15112a6e31e053ad0670096c23bda2fc341e4.zip
erts: Add enif_has_pending_exception
Diffstat (limited to 'erts/emulator/test')
-rw-r--r--erts/emulator/test/nif_SUITE_data/nif_SUITE.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index b30c484a6c..87f0e72d9f 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -892,6 +892,7 @@ static ERL_NIF_TERM check_is_exception(ErlNifEnv* env, int argc, const ERL_NIF_T
ERL_NIF_TERM badarg = enif_make_badarg(env);
if (enif_is_exception(env, error_atom)) return error_atom;
if (!enif_is_exception(env, badarg)) return error_atom;
+ if (!enif_has_pending_exception(env)) return error_atom;
return badarg;
}
@@ -1692,6 +1693,7 @@ static ERL_NIF_TERM call_nif_nan_or_inf(ErlNifEnv* env, int argc, const ERL_NIF_
}
res = enif_make_double(env, val);
assert(enif_is_exception(env, res));
+ assert(enif_has_pending_exception(env));
if (strcmp(arg, "tuple") == 0) {
return enif_make_tuple2(env, argv[0], res);
} else {