More emscripten_out/err use in test code. NFC (#19972)

Some instances that I missed in #19524

Author: sbc100

test/core/test_asyncify_during_exit.cpp

@@ -1,16 +1,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <emscripten.h>
+#include <emscripten/emscripten.h>
+#include <emscripten/console.h>
 
 void during_exit() {
   // An attempt to sleep during exit, which is not allowed (the exit process is
   // done in synchronous JS).
-  EM_ASM({ out("during_exit 1") });
+  emscripten_out("during_exit 1");
 #ifndef NO_ASYNC
   emscripten_sleep(100);
 #endif
-  EM_ASM({ out("during_exit 2") });
+  emscripten_out("during_exit 2");
 }
 
 int main() {

test/core/test_dlmalloc_partial_2.c

@@ -7,12 +7,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <emscripten.h>
+#include <emscripten/console.h>
+
 void *malloc(size_t size) { return (void *)123; }
 int main() {
   void *x = malloc(10);
-  EM_ASM({ out("got 0x" + $0.toString(16)) }, x);
+  emscripten_outf("got %p", x);
   free(0);
-  EM_ASM({ out("freed a fake") });
+  emscripten_outf("freed a fake");
   return 1;
 }

test/core/test_embind_5.cpp

@@ -3,7 +3,8 @@
 // University of Illinois/NCSA Open Source License.  Both these licenses can be
 // found in the LICENSE file.
 
-#include <emscripten.h>
+#include <emscripten/em_asm.h>
+#include <emscripten/console.h>
 #include <emscripten/bind.h>
 
 using namespace emscripten;
@@ -12,26 +13,26 @@ using namespace emscripten;
 class MyFoo {
 public:
   MyFoo() {
-    EM_ASM({out("constructing my foo");});
+    emscripten_out("constructing my foo");
   }
   virtual void doit() {
-    EM_ASM({out("doing it");});
+    emscripten_out("doing it");
   }
   virtual ~MyFoo() {
-    EM_ASM({out("destructing my foo");});
+    emscripten_out("destructing my foo");
   }
 };
 
 class MyBar : public MyFoo {
 public:
   MyBar() {
-    EM_ASM({out("constructing my bar");});
+    emscripten_out("constructing my bar");
   }
   void doit() override {
-    EM_ASM({out("doing something else");});
+    emscripten_out("doing something else");
   }
   virtual ~MyBar() override {
-    EM_ASM({out("destructing my bar");});
+    emscripten_out("destructing my bar");
   }
 };
 

test/other/test_pthread_out_err.c

@@ -1,27 +1,19 @@
 #include <stdio.h>
-#include <emscripten/em_asm.h>
-
-void out(const char* msg) {
-  EM_ASM({ out(UTF8ToString($0)); }, msg);
-}
-
-void err(const char* msg) {
-  EM_ASM({ err(UTF8ToString($0)); }, msg);
-}
+#include <emscripten/console.h>
 
 // Test that stdout/printf and emscripten JS logging functions (out()
 // and err()) are interleaved as expected and all arrive at the console.
 // See https://github.com/emscripten-core/emscripten/issues/14804
 int main() {
-  printf("printf 1\n");
-  out   ("out    1");
-  err   ("err    1");
-  printf("printf 2\n");
-  out   ("out    2");
-  err   ("err    2");
-  printf("printf 3\n");
-  out   ("out    3");
-  err   ("err    3");
+  printf        ("printf 1\n");
+  emscripten_out("out    1");
+  emscripten_err("err    1");
+  printf        ("printf 2\n");
+  emscripten_out("out    2");
+  emscripten_err("err    2");
+  printf        ("printf 3\n");
+  emscripten_out("out    3");
+  emscripten_err("err    3");
   printf("done\n");
   return 0;
 }

test/pthread/test_pthread_create.cpp

@@ -49,7 +49,7 @@ void *ThreadMain(void *arg)
 	int numGood = 0;
 	for(unsigned int i = 0; i < N; ++i)
 		if (n[i] == i) ++numGood;
-		else EM_ASM(err('n['+$0+']='+$1), i, n[i]);
+		else emscripten_errf("n[%d]=%d", i, n[i]);
 
 	emscripten_outf("Thread idx %ld with param %d: all done with result %d.", idx, param, numGood);
 	pthread_exit((void*)numGood);
@@ -84,7 +84,7 @@ int main()
 				int status;
 				int rc = pthread_join(thread[i], (void**)&status);
 				assert(rc == 0);
-				EM_ASM(err('Main: Joined thread idx ' + $0 + ' (param ' + $1 + ') with status ' + $2), i, global_shared_data[i], (int)status);
+				emscripten_errf("Main: Joined thread idx %d (param %d) with status %d", i, global_shared_data[i], (int)status);
 				assert(status == N);
 				thread[i] = 0;
 				if (numThreadsToCreate > 0)

test/pthread/test_pthread_sbrk.cpp

@@ -5,6 +5,7 @@
 
 #include <pthread.h>
 #include <emscripten.h>
+#include <emscripten/console.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -72,7 +73,7 @@ static void *thread_start(void *arg)
       {
         ++return_code; // Failed! (but run to completion so that the barriers will all properly proceed without hanging)
         if (!reported_once) {
-          EM_ASM(err('Memory corrupted! mem[i]: ' + $0 + ' != ' + $1 + ', i: ' + $2 + ', j: ' + $3), allocated_buffers[i][j], id, i, j);
+          emscripten_errf("Memory corrupted! mem[i]: %d != %d, i: %d, j: %d", allocated_buffers[i][j], id, i, j);
           reported_once = 1; // Avoid print flood that makes debugging hard.
         }
       }

test/pthread/test_pthread_thread_local_storage.cpp

@@ -25,7 +25,7 @@ void *ThreadMain(void *arg)
 		for(int i = 0; i < NUM_KEYS; ++i)
 		{
 			local_keys[i] = (uintptr_t)pthread_getspecific(keys[i]);
-//			EM_ASM(err('Thread ' + $0 + ': Read value ' + $1 + ' from TLS for key at index ' + $2), pthread_self(), (int)local_keys[i], i);
+//		emscripten_errf("Thread %d: Read value %d from TLS for key at index %d", pthread_self(), (int)local_keys[i], i);
 		}
 
 		for(int i = 0; i < NUM_KEYS; ++i)
@@ -38,7 +38,7 @@ void *ThreadMain(void *arg)
 	for(int i = 0; i < NUM_KEYS; ++i)
 	{
 		local_keys[i] = (uintptr_t)pthread_getspecific(keys[i]);
-//		EM_ASM(err('Thread ' + $0 + ' final verify: Read value ' + $1 + ' from TLS for key at index ' + $2), pthread_self(), (int)local_keys[i], i);
+//	emscripten_errf("Thread %d final verify: Read value %d from TLS for key at index %d", pthread_self(), (int)local_keys[i], i);
 		assert(local_keys[i] == NUM_ITERS);
 	}
 	return 0;