Cleanup some async browser tests. NFC (#25101)

- Convert the tests to C
- Rename to include `test_` prefix
- Use `reportResultToServer` instead of direct fetch.

Author: sbc100

test/browser/async_returnvalue.js

@@ -17,8 +17,7 @@ int main() {
         Module.reported = true;
         console.log("reporting success");
         // manually REPORT_RESULT; we shouldn't call back into native code at this point
-        await fetch("/report_result?0");
-        window.close();
+        reportResultToServer(0);
       }
     };
     return 0;
@@ -30,6 +29,5 @@ int main() {
   // functions - this function should be instrumented, but will not be.
   puts("We should not get here!");
   REPORT_RESULT(1);
-
-  return 0;
+  return 1;
 }

test/browser/async.cpp renamed to test/browser/test_async.c

@@ -5,28 +5,25 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdbool.h>
 
 #include <emscripten.h>
 
 // A "sync" tunnel that adds 1.
 #if USE_EM_JS
 EM_JS(int, sync_tunnel, (int value), {
   return Asyncify.handleSleep((wakeUp) => {
-    setTimeout(function() {
-      wakeUp(value + 1);
-    }, 1);
+    setTimeout(() => wakeUp(value + 1), 1);
   });
 })
 EM_JS(int, sync_tunnel_bool, (bool value), {
   return Asyncify.handleSleep((wakeUp) => {
-    setTimeout(function() {
-      wakeUp(!value);
-    }, 1);
+    setTimeout(() => wakeUp(!value), 1);
   });
 })
 #else
-extern "C" int sync_tunnel(int);
-extern "C" int sync_tunnel_bool(bool);
+int sync_tunnel(int);
+int sync_tunnel_bool(bool);
 #endif
 
 int main() {
@@ -35,12 +32,9 @@ int main() {
     window.disableErrorReporting = true;
     window.onerror = async (e) => {
       var success = e.toString().indexOf("import sync_tunnel was not in ASYNCIFY_IMPORTS, but changed the state") > 0;
-      if (success && !Module.reported) {
-        Module.reported = true;
+      if (success) {
         console.log("reporting success");
-        // manually REPORT_RESULT; we shouldn't call back into native code at this point
-        await fetch("/report_result?0");
-        window.close();
+        maybeReportResultToServer(0);
       }
     };
   });
@@ -65,11 +59,10 @@ int main() {
   y = sync_tunnel_bool(true);
   assert(y == false);
 
-
-
 #ifdef BAD
   // We should not get here.
   printf("We should not get here\n");
+  assert(false);
 #else
   // Success!
   REPORT_RESULT(0);

test/browser/async_2.cpp renamed to test/browser/test_async_2.c

@@ -0,0 +1,12 @@
+addToLibrary({
+  sync_tunnel: (value) => {
+    return Asyncify.handleSleep((wakeUp) => {
+      setTimeout(() => wakeUp(value + 1), 1);
+    });
+  },
+  sync_tunnel_bool: (value) => {
+    return Asyncify.handleSleep((wakeUp) => {
+      setTimeout(() => wakeUp(!value), 1);
+    });
+  },
+});

test/browser/async_bad_list.cpp renamed to test/browser/test_async_bad_list.c

@@ -3298,19 +3298,19 @@ def test_async(self, args):
 
     for opts in (0, 1, 2, 3):
       print(opts)
-      self.btest_exit('async.cpp', cflags=['-O' + str(opts), '-g2'] + args)
+      self.btest_exit('test_async.c', cflags=['-O' + str(opts), '-g2'] + args)
 
   def test_asyncify_tricky_function_sig(self):
     self.btest('test_asyncify_tricky_function_sig.cpp', '85', cflags=['-sASYNCIFY_ONLY=[foo(char.const*?.int#),foo2(),main,__original_main]', '-sASYNCIFY'])
 
   def test_async_in_pthread(self):
-    self.btest_exit('async.cpp', cflags=['-sASYNCIFY', '-pthread', '-sPROXY_TO_PTHREAD', '-g'])
+    self.btest_exit('test_async.c', cflags=['-sASYNCIFY', '-pthread', '-sPROXY_TO_PTHREAD', '-g'])
 
   def test_async_2(self):
     # Error.stackTraceLimit default to 10 in chrome but this test relies on more
     # than 40 stack frames being reported.
     create_file('pre.js', 'Error.stackTraceLimit = 80;\n')
-    self.btest_exit('async_2.cpp', cflags=['-O3', '--pre-js', 'pre.js', '-sASYNCIFY', '-sSTACK_SIZE=1MB'])
+    self.btest_exit('test_async_2.c', cflags=['-O3', '--pre-js', 'pre.js', '-sASYNCIFY', '-sSTACK_SIZE=1MB'])
 
   @parameterized({
     '': ([],),
@@ -3355,7 +3355,7 @@ def test_async_iostream(self):
   # ASYNCIFY_IMPORTS.
   # To make the test more precise we also use ASYNCIFY_IGNORE_INDIRECT here.
   @parameterized({
-    'normal': (['-sASYNCIFY_IMPORTS=sync_tunnel,sync_tunnel_bool'],), # noqa
+    '': (['-sASYNCIFY_IMPORTS=sync_tunnel,sync_tunnel_bool'],), # noqa
     'pattern_imports': (['-sASYNCIFY_IMPORTS=[sync_tun*]'],), # noqa
     'response': (['[email protected]'],), # noqa
     'nothing': (['-DBAD'],), # noqa
@@ -3365,10 +3365,10 @@ def test_async_iostream(self):
   def test_async_returnvalue(self, args):
     if '@' in str(args):
       create_file('filey.txt', 'sync_tunnel\nsync_tunnel_bool\n')
-    self.btest('async_returnvalue.cpp', '0', cflags=['-sASYNCIFY', '-sASYNCIFY_IGNORE_INDIRECT', '--js-library', test_file('browser/async_returnvalue.js')] + args + ['-sASSERTIONS'])
+    self.btest('test_async_returnvalue.c', '0', cflags=['-sASSERTIONS', '-sASYNCIFY', '-sASYNCIFY_IGNORE_INDIRECT', '--js-library', test_file('browser/test_async_returnvalue.js')] + args)
 
   def test_async_bad_list(self):
-    self.btest('async_bad_list.cpp', '0', cflags=['-sASYNCIFY', '-sASYNCIFY_ONLY=waka', '--profiling'])
+    self.btest('test_async_bad_list.c', '0', cflags=['-sASYNCIFY', '-sASYNCIFY_ONLY=waka', '--profiling'])
 
   # Tests that when building with -sMINIMAL_RUNTIME, the build can use -sMODULARIZE as well.
   def test_minimal_runtime_modularize(self):