Merge branch sverker/remove-latin1-atom-encoding/OTP-14337

* sverker/remove-latin1-atom-encoding:
  kernel: Fix erl_distribution_wb_SUITE:whitebox
  kernel: Remove pg2_SUITE:compat
  erts: Remove fun_r13_SUITE
  stdlib: Remove test cases for R12 io protocol
  kernel: Make DFLAG_UTF8_ATOMS mandatory
  kernel: Rewrite distribution flag verification
  tools: Update assumptions in lcnt about external atom format
  stdlib: Tweak beam_lib_SUITE whitebox assumptions
  orber: Remove hard dependency to external atom format
  kernel: Try mend disk_log whitebox tests
  erts: Mark latin1 atom encoding as deprecated
  jinterface: Do not generate atoms on old latin1 external format
  erl_interface: Do not generate atoms on old latin1 ext format
  erts: Do not generate atoms on old latin1 external format
  erts: Fix faulty ASSERT for failed dec_term

1 files changed, 18 insertions, 18 deletions

diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index ac6ec9cf4e..43484a1319 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -184,17 +184,17 @@ test_ei_encode_misc(Config) when is_list(Config) ->
     {<<70,_:8/binary>>,Fp1} = get_buf_and_term(P),
     true = match_float(Fp1, 1.0),
 
-    {<<100,0,5,"false">>,false}  = get_buf_and_term(P),
-    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-
-    {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
-    {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
-    {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
-    {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    {<<$w,5,"false">>,false}  = get_buf_and_term(P),
+    {<<$w,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<$w,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<$w,4,"true">> ,true}   = get_buf_and_term(P),
+
+    {<<$w,3,"foo">>,foo}         = get_buf_and_term(P),
+    {<<$w,3,"foo">>,foo}         = get_buf_and_term(P),
+    {<<$w,0,"">>,''}             = get_buf_and_term(P),
+    {<<$w,0,"">>,''}             = get_buf_and_term(P),
+    {<<$w,12,"ÅÄÖåäö"/utf8>>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    {<<$w,12,"ÅÄÖåäö"/utf8>>,'ÅÄÖåäö'} = get_buf_and_term(P),
 
     {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
     {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
@@ -239,12 +239,12 @@ test_ei_encode_utf8_atom(Config) ->
     P = runner:start(?test_ei_encode_utf8_atom),
 
     {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
-    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
     {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
 
     {<<119,1,$A>>,'A'} = get_buf_and_term(P),
-    {<<100,0,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<119,1,$A>>,'A'} = get_buf_and_term(P),
 
     runner:recv_eot(P),
     ok.
@@ -254,13 +254,13 @@ test_ei_encode_utf8_atom_len(Config) ->
     P = runner:start(?test_ei_encode_utf8_atom_len),
 
     {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
-    {<<100,0,2,197,196>>,'ÅÄ'} = get_buf_and_term(P),
-    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<119,4,195,133,195,132>>,'ÅÄ'} = get_buf_and_term(P),
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
     {<<119,4,195,133,195,132>>,'ÅÄ'} = get_buf_and_term(P),
 
     {<<119,1,$A>>,'A'} = get_buf_and_term(P),
-    {<<100,0,2,$A,$B>>,'AB'} = get_buf_and_term(P),
-    {<<100,0,255,_:(255*8)>>,_} = get_buf_and_term(P),
+    {<<119,2,$A,$B>>,'AB'} = get_buf_and_term(P),
+    {<<119,255,_:(255*8)>>,_} = get_buf_and_term(P),
 
     runner:recv_eot(P),
     ok.