diff options
| author | Sverker Eriksson <[email protected]> | 2019-03-25 18:24:04 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-03-25 18:24:04 +0100 |
| commit | a2b406898cb38b1bf1e812ec87349ee0cd3866ed (patch) | |
| tree | d6a7e172988859d0dae941fc55978ddbc6b5c101 /erts | |
| parent | 2e6166dbef6af554e623f8ddc59abc126f50c584 (diff) | |
| parent | 2615586202df20dbd1ee05b0feef162ad31d6db0 (diff) | |
| download | otp-a2b406898cb38b1bf1e812ec87349ee0cd3866ed.tar.gz otp-a2b406898cb38b1bf1e812ec87349ee0cd3866ed.tar.bz2 otp-a2b406898cb38b1bf1e812ec87349ee0cd3866ed.zip | |
Merge branch 'sverker/bug-fixing'
* sverker/bug-fixing:
erts: Fix erts_debug:set_internal_state(reds_left)
erts: Fix binary_SUITE:cmp_old_impl
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 1 | ||||
| -rw-r--r-- | erts/emulator/test/binary_SUITE.erl | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 504aa8f943..a7424bbcb8 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -4442,6 +4442,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) BIF_P->fcalls = reds; else BIF_P->fcalls = reds - CONTEXT_REDS; + BIF_P->scheduler_data->virtual_reds = 0; } BIF_RET(am_true); } diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl index 1406ddc9dc..563d60cc3f 100644 --- a/erts/emulator/test/binary_SUITE.erl +++ b/erts/emulator/test/binary_SUITE.erl @@ -1703,13 +1703,16 @@ error_after_yield_bad_ext_term() -> BadAtomExt]). %% Invalid atom at the end cmp_old_impl(Config) when is_list(Config) -> - %% Compare results from new yielding implementations with - %% old non yielding implementations + %% This test was originally a comparison with the non yielding + %% implementation in R16B. Since OTP 22 we can't talk distribution with such + %% old nodes (< 19). The test case it kept but compares with previous major + %% version for semantic regression test. Cookie = atom_to_list(erlang:get_cookie()), - Rel = "r16b_latest", + Rel = (integer_to_list(list_to_integer(erlang:system_info(otp_release)) - 1) + ++ "_latest"), case test_server:is_release_available(Rel) of false -> - {skipped, "No "++Rel++" available"}; + {skipped, "No OTP "++Rel++" available"}; true -> {ok, Node} = test_server:start_node(list_to_atom(atom_to_list(?MODULE)++"_"++Rel), peer, |