Make more use of emscripten_out/emscripten_err in test code. NFC (#19524)

Using these emscripten wrappers has some advantages. In particular,
with workers we have seen issues with writes to
console.log/console.error being lost in some cases.

Author: sbc100

test/core/test_em_asm.cpp

@@ -12,7 +12,7 @@ int main() {
 
   unsigned long p = 8;
   EM_ASM({
-    console.log("int types:");
+    out("int types:");
     out("         char : " + $0);
     out("  signed char : " + $1);
     out("unsigned char : " + $2);
@@ -71,35 +71,35 @@ int main() {
 
   // Test mixing ints and doubles
   EM_ASM({
-    console.log("idii");
+    out("idii");
     out("a " + $0);
     out("b " + $1);
     out("c " + $2);
     out("d " + $3);
   }, 1, 3.14159, 3, 4);
   EM_ASM({
-    console.log("diii");
+    out("diii");
     out("a " + $0);
     out("b " + $1);
     out("c " + $2);
     out("d " + $3);
   }, 3.14159, 2, 3, 4);
   EM_ASM({
-    console.log("iidi");
+    out("iidi");
     out("a " + $0);
     out("b " + $1);
     out("c " + $2);
     out("d " + $3);
   }, 1, 2, 3.14159, 4);
   EM_ASM({
-    console.log("ddii");
+    out("ddii");
     out("a " + $0);
     out("b " + $1);
     out("c " + $2);
     out("d " + $3);
   }, 3.14159, 2.1828, 3, 4);
   EM_ASM({
-    console.log("iddi");
+    out("iddi");
     out("a " + $0);
     out("b " + $1);
     out("c " + $2);

test/core/test_em_asm_2.cpp

@@ -16,7 +16,7 @@ int main(int argc, char **argv) {
   // Promotions of arrays, function/member pointers and objects implicitly
   // convertible to numbers are excluded because they will not be translated
   // to corresponding JS objects.
-#define TEST_TYPE(type, value) EM_ASM({console.log(#type, Number($0));}, (type)(value));
+#define TEST_TYPE(type, value) EM_ASM({out(#type, Number($0));}, (type)(value));
   TEST_TYPE(int*, 0);
   TEST_TYPE(float, 1.5f);
   TEST_TYPE(double, 2.5);
@@ -39,14 +39,14 @@ int main(int argc, char **argv) {
 
   struct WithBitField w;
   w.x = 3;
-  EM_ASM({ console.log('bit field', $0); }, w.x);
+  EM_ASM({ out('bit field', $0); }, w.x);
 
 #ifdef __cplusplus
   TEST_TYPE(bool, true);
   TEST_TYPE(wchar_t, 50);
 #else
-  EM_ASM({console.log('bool 1')});
-  EM_ASM({console.log('wchar_t 50')});
+  EM_ASM({out('bool 1')});
+  EM_ASM({out('wchar_t 50')});
 #endif
 
   TEST_TYPE(enum SomeEnum, SIXTY);

test/core/test_em_asm_types.cpp

@@ -2,11 +2,11 @@
 #include <emscripten.h>
 
 EM_JS(void, foo, (uint64_t a, int64_t b), {
-  console.log(typeof a);
-  console.log(typeof b);
+  out(typeof a);
+  out(typeof b);
 
-  console.log('a:' + a);
-  console.log('b:' + b);
+  out('a:' + a);
+  out('b:' + b);
 })
 
 int main() {

test/core/test_em_js_i64.c

@@ -1,4 +1,5 @@
-#include <emscripten.h>
+#include <emscripten/emscripten.h>
+#include <emscripten/console.h>
 #include <emscripten/exports.h>
 
 extern "C" EMSCRIPTEN_KEEPALIVE int foo()
@@ -17,10 +18,10 @@ int main()
 {
 	intfunc f = (intfunc)emscripten_get_exported_function("_foo");
 	intfunc b = (intfunc)emscripten_get_exported_function("_bar");
-	EM_ASM(console.log($0 + ' ' + $1), f(), b());
+	emscripten_outf("%d %d", f(), b());
 
 	// Obtaining the same function pointer twice should return the
 	// same address.
 	intfunc b2 = (intfunc)emscripten_get_exported_function("_bar");
-	EM_ASM(console.log($0), b == b2);
+	emscripten_outf("%d", b == b2);
 }

test/core/test_get_exported_function.cpp

@@ -97,9 +97,9 @@ EM_ASYNC_JS(void, test, (), {
     setTimeout(Module.unsuspend);
     await Module.suspend();
 
-    console.log('done');
+    out('done');
   } catch (e) {
-    console.log('Failed: ' + e.stack);
+    out('Failed: ' + e.stack);
   }
 });
 

test/embind/embind_jspi_test.cpp

@@ -19,10 +19,10 @@ EMSCRIPTEN_BINDINGS(constants) {
 }
 
 int main() {
-    EM_ASM(
-        console.log("PI (as double) = " + Module['PI']);
-        console.log("EULER = " + Module['EULER']);
-        console.log("pi (as float) = " + Module['pi']);
-        console.log("euler = " + Module['euler']);
-    );
-}
+  EM_ASM(
+    out("PI (as double) = " + Module['PI']);
+    out("EULER = " + Module['EULER']);
+    out("pi (as float) = " + Module['pi']);
+    out("euler = " + Module['euler']);
+  );
+}

test/embind/test_float_constants.cpp

@@ -22,10 +22,10 @@ EMSCRIPTEN_BINDINGS(constants) {
 
 int main() {
     EM_ASM(
-        console.log("NEGATIVE_FLOAT_NUM = " + Module['NEGATIVE_FLOAT_NUM']);
-        console.log("NEGATIVE_INT_NUM = " + Module['NEGATIVE_INT_NUM']);
-        console.log("negative_float_num = " + Module['negative_float_num']);
-        console.log("negative_double_num = " + Module['negative_double_num']);
-        console.log("negative_int_num = " + Module['negative_int_num']);
+      out("NEGATIVE_FLOAT_NUM = " + Module['NEGATIVE_FLOAT_NUM']);
+      out("NEGATIVE_INT_NUM = " + Module['NEGATIVE_INT_NUM']);
+      out("negative_float_num = " + Module['negative_float_num']);
+      out("negative_double_num = " + Module['negative_double_num']);
+      out("negative_int_num = " + Module['negative_int_num']);
     );
-}
+}

test/embind/test_negative_constants.cpp

@@ -17,7 +17,7 @@ int main()
   // If an exception is thrown from the user callback, it bubbles up to self.onerror but is otherwise completely
   // swallowed by xhr.send.
   EM_ASM({self.onerror = function() {
-           console.log('Got error');
+           out('Got error');
            HEAP32[$0 >> 2] = 2;
          };}, &result);
   emscripten_fetch_attr_t attr;

test/fetch/sync_xhr.cpp

@@ -7,11 +7,11 @@
 
 #include <pthread.h>
 #include <emscripten.h>
-#include <emscripten/html5.h>
+#include <emscripten/console.h>
 
 void *thread_main(void *arg)
 {
-	EM_ASM(out('hello from thread!'));
+	emscripten_out("hello from thread!");
 	emscripten_force_exit(0);
 	__builtin_trap();
 }