diff options
author | Rickard Green <[email protected]> | 2014-06-06 01:47:49 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2014-06-06 01:47:49 +0200 |
commit | fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82 (patch) | |
tree | 7238e0341da395b7b1ea45788697de764bdbc009 /lib/tools/test/xref_SUITE.erl | |
parent | cb252aecf7da924e2959dadd390f1bbd320b2eb8 (diff) | |
parent | 82c048745efcb5d811ec0489858b821ef39ea387 (diff) | |
download | otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.tar.gz otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.tar.bz2 otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.zip |
Merge branch 'rickard/binary_to_term_error/OTP-11931' into maint
* rickard/binary_to_term_error/OTP-11931:
Replace erlang:binary_to_term() Erlang wrappers
Conflicts:
erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'lib/tools/test/xref_SUITE.erl')
-rw-r--r-- | lib/tools/test/xref_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl index 353275ae3b..6870aefe5c 100644 --- a/lib/tools/test/xref_SUITE.erl +++ b/lib/tools/test/xref_SUITE.erl @@ -1098,7 +1098,6 @@ read_expected(Version) -> {POS1+1,{FF,{mod17,fun17,0}}}, {POS1+2,{FF,{erlang,spawn,1}}}, {POS1+2,{FF,{read,local,0}}}, - {POS1+3,{FF,{erlang,binary_to_term,1}}}, {POS1+3,{FF,{erlang,spawn,1}}}, {POS1+4,{FF,{dist,func,0}}}, {POS1+4,{FF,{erlang,spawn,1}}}, @@ -1207,6 +1206,7 @@ read_expected(Version) -> OKB1 = [{POS13+1,{FF,{erts_debug,apply,4}}}, {POS13+2,{FF,{erts_debug,apply,4}}}, {POS13+3,{FF,{erts_debug,apply,4}}}, + {POS1+3, {FF,{erlang,binary_to_term,1}}}, {POS3+1, {FF,{erlang,spawn,3}}}, {POS3+2, {FF,{erlang,spawn,3}}}, {POS3+3, {FF,{erlang,spawn_link,3}}}, |