Merge branch 'sverk/ic/tests'

* sverk/ic/tests:
  ic: Making tests pass after changes in erl_interface and jinterface
  ic: Revert --enable-silent-rules for test Makefile

OTP-10785

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
index e4f9cfdece..98fcdcc60f 100644
--- a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
@@ -390,6 +390,7 @@ int main(int argc, char **argv)
     env->_from_pid = &pid;
     
     strcpy(pid.node, this_node);
+    pid.node_org_enc = ERLANG_LATIN1;
     pid.num = fd;
     pid.serial = 0;
     pid.creation = 0;
@@ -1006,7 +1007,7 @@ static int string4_test(IC_Env *env)
 
 static int pid_test(IC_Env *env)
 {
-    erlang_pid pid = {"", 7, 0, 0}, pido, pidr;
+    erlang_pid pid = {"", ERLANG_LATIN1, 7, 0, 0}, pido, pidr;
 
     strcpy(pid.node, this_node), /* this currently running node */
     fprintf(stdout, "\n======== m_i_pid test ======\n\n");
@@ -1030,7 +1031,7 @@ static int pid_test(IC_Env *env)
 
 static int port_test(IC_Env *env)
 {
-    erlang_port porti = {"node", 5, 1}, porto, portr;
+    erlang_port porti = {"node", ERLANG_LATIN1, 5, 1}, porto, portr;
 
     fprintf(stdout, "\n======== m_i_port test ======\n\n");
     portr = m_i_port_test(NULL, &porti, &porto, env);
@@ -1053,7 +1054,7 @@ static int port_test(IC_Env *env)
 
 static int ref_test(IC_Env *env)
 {
-    erlang_ref refi = { "node1", 3, {1, 2, 3}, 1},  
+    erlang_ref refi = { "node1", ERLANG_UTF8, 3, {1, 2, 3}, 1},  
 	refo, refr;
 
     fprintf(stdout, "\n======== m_i_ref test ======\n\n");
@@ -1111,6 +1112,7 @@ static int typedef_test(IC_Env *env)
     long tl;
 
     strcpy(mbi.node,"node");
+    mbi.node_org_enc = ERLANG_LATIN1;
     mbi.id = 15;
     mbi.creation = 1;