Convert more btests to btest_exit. NFC (#14415)

There are still many more to convert.. perhaps we should
be more systematic about it. For now I'm just doing them
in batches by hand to keep the reviews of reasonable size.

Author: sbc100

tests/browser/test_emscripten_unwind_to_js_event_loop.c

@@ -1,22 +1,16 @@
 #include <emscripten/html5.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-void timeout(void *userData)
-{
-	printf("Got timeout handler\n");
-#ifdef REPORT_RESULT
-	// Test passed
-	REPORT_RESULT(1);
-#endif
+void timeout(void *userData) {
+  printf("Got timeout handler\n");
+  // Test passed
+  exit(0);
 }
 
-int main()
-{
-	emscripten_set_timeout(timeout, 2000, 0);
-	emscripten_unwind_to_js_event_loop();
-	printf("This should not be called!\n");
-#ifdef REPORT_RESULT
-	// Should not reach here
-	REPORT_RESULT(-1);
-#endif
+int main() {
+  emscripten_set_timeout(timeout, 2000, 0);
+  emscripten_unwind_to_js_event_loop();
+  // emscripten_unwind_to_js_event_loop should never return
+  __builtin_unreachable();
 }

tests/canvas_animate_resize.cpp

@@ -81,9 +81,6 @@ void tick()
     emscripten_webgl_make_context_current(0);
     emscripten_webgl_destroy_context(ctx);
     printf("quit\n");
-#ifdef REPORT_RESULT
-    REPORT_RESULT(1);
-#endif
     exit(0);
   }
 }
@@ -154,4 +151,5 @@ int main()
     usleep(16*1000);
   }
 #endif
+  return 99;
 }

tests/cstdio/test_remove.cpp

@@ -64,9 +64,5 @@ int main() {
   atexit(cleanup);
   setup();
   test();
-
-#ifdef REPORT_RESULT
-  REPORT_RESULT(0);
-#endif
-  return EXIT_SUCCESS;
+  return 0;
 }

tests/emscripten_api_browser.cpp renamed to tests/emscripten_api_browser.c

@@ -3,17 +3,17 @@
 // University of Illinois/NCSA Open Source License.  Both these licenses can be
 // found in the LICENSE file.
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
 #include <SDL.h>
 #include <emscripten.h>
 #include <assert.h>
 
+bool exit_ok = false;
 int last = 0;
 
-extern "C" {
-
 bool pre1ed = false;
 bool pre2ed = false;
 void pre1(void *arg) {
@@ -43,7 +43,9 @@ void argey(void* arg) {
   printf("argey: %d\n", counter);
   if (counter == 5) {
     emscripten_cancel_main_loop();
-    REPORT_RESULT(1);
+    // The main loop is now done so its ok to run atexit handlers.
+    exit_ok = true;
+    exit(0);
   }
 }
 
@@ -75,22 +77,22 @@ void four(void *arg) {
 void __attribute__((used)) third() {
   int now = SDL_GetTicks();
   printf("thard! %d\n", now);
-  assert(fabs(now - last - 1000) < 500);
+  assert(abs(now - last - 1000) < 500);
   emscripten_async_call(four, (void*)43, -1); // triggers requestAnimationFrame
 }
 
 void second(void *arg) {
   int now = SDL_GetTicks();
   printf("sacond! %d\n", now);
-  assert(fabs(now - last - 500) < 250);
+  assert(abs(now - last - 500) < 250);
   last = now;
   emscripten_async_run_script("Module._third()", 1000);
 }
 
-}
-
-void never() {
-  REPORT_RESULT(0);
+// Should not be called when main return but only once the
+// main loops is stopped and the runtime shuts down.
+void check_exit_ok() {
+  assert(exit_ok == true);
 }
 
 int main() {
@@ -105,7 +107,7 @@ int main() {
 
   assert(ratio == ratio2);
 
-  atexit(never); // should never be called - it is wrong to exit the runtime orderly if we have async calls!
+  atexit(check_exit_ok);
 
   emscripten_async_call(second, (void*)0, 500);
 

tests/emscripten_api_browser2.cpp renamed to tests/emscripten_api_browser2.c

@@ -4,18 +4,17 @@
 // found in the LICENSE file.
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
 #include <emscripten.h>
 
 int value = 0;
 
-extern "C" {
-  void set(int x) {
-    printf("set! %d\n", x);
-    value = x;
-  }
+void set(int x) {
+  printf("set! %d\n", x);
+  value = x;
 }
 
 void load2() {
@@ -34,8 +33,9 @@ void load2() {
   fclose(f);
   assert(strcmp(buffer, "second") == 0);
 
-  REPORT_RESULT(1);
+  exit(0);
 }
+
 void error2() {
   printf("fail2\n");
 }
@@ -45,13 +45,12 @@ void load1() {
   assert(value == 456);
   emscripten_async_load_script("script2.js", load2, error2);
 }
+
 void error1() {
   printf("fail1\n");
 }
 
 int main() {
   emscripten_async_load_script("script1.js", load1, error1);
-
-  return 1;
+  return 99;
 }
-

tests/emscripten_api_browser_infloop.cpp

@@ -4,6 +4,7 @@
 // found in the LICENSE file.
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <emscripten.h>
 
@@ -19,8 +20,8 @@ struct Class {
     printf("waka %d\n", x++);
 
     if (x == 7 || x < 0) {
-      REPORT_RESULT(x);
       emscripten_cancel_main_loop();
+      exit(x);
     }
   }
 

tests/emscripten_get_device_pixel_ratio.c

@@ -1,15 +1,10 @@
+#include <assert.h>
 #include <stdio.h>
 #include <emscripten/emscripten.h>
 
-int main()
-{
-	double devicePixelRatio = emscripten_get_device_pixel_ratio();
-	printf("window.devicePixelRatio = %f.\n", devicePixelRatio);
-	int result = (devicePixelRatio > 0) ? 1 : 0;
-	if (result) {
-		printf("Test succeeded!\n");
-	}
-#ifdef REPORT_RESULT
-	REPORT_RESULT(result);
-#endif
+int main() {
+  double devicePixelRatio = emscripten_get_device_pixel_ratio();
+  printf("window.devicePixelRatio = %f.\n", devicePixelRatio);
+  assert(devicePixelRatio > 0);
+  return 0;
 }

tests/emscripten_main_loop.cpp

@@ -13,10 +13,8 @@ int frame = 0;
 
 void final(void*) {
   assert(frame == 110);
-#ifdef REPORT_RESULT
   printf("Test passed.\n");
-  REPORT_RESULT(0);
-#endif
+  exit(0);
 }
 
 void looper() {
@@ -29,11 +27,8 @@ void looper() {
     timesTooSoon++;
     if (timesTooSoon >= 10) {
       printf("Abort: main loop tick was called too quickly after the previous frame, too many times!\n");
-#ifdef REPORT_RESULT
-      REPORT_RESULT(1);
-#endif
       emscripten_cancel_main_loop();
-      exit(0);
+      exit(1);
     }
   }
   prevTime = curTime;
@@ -42,11 +37,8 @@ void looper() {
     timesTooSoon++;
     if (timesTooSoon >= 2) {
       printf("Abort: With swap interval of 4, we should be running at most 15fps! (or 30fps on 120Hz displays) but seems like swap control is not working and we are running at 60fps!\n");
-#ifdef REPORT_RESULT
-      REPORT_RESULT(2);
-#endif
       emscripten_cancel_main_loop();
-      exit(0);
+      exit(2);
     }
   }
   if (frame > 0 && frame < 90 && frame % 10 == 0) {
@@ -79,4 +71,5 @@ void looper() {
 
 int main() {
   emscripten_set_main_loop(looper, 5, 1);
+  return 99;
 }

tests/emscripten_main_loop_and_blocker.cpp

@@ -14,20 +14,12 @@ bool blockerExecuted = false;
 
 void final(void*) {
   assert(frame == 20);
-#ifdef REPORT_RESULT
-  REPORT_RESULT(0);
-#else
   exit(0);
-#endif
 }
 
 void looper() {
   if (blockerExecuted == false) {
-#ifdef REPORT_RESULT
-    REPORT_RESULT(1);
-#else
     exit(1);
-#endif
   }
 
   frame++;

tests/emscripten_main_loop_setimmediate.cpp

@@ -3,6 +3,7 @@
 // University of Illinois/NCSA Open Source License.  Both these licenses can be
 // found in the LICENSE file.
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
@@ -21,15 +22,16 @@ void looper() {
     double now = emscripten_get_now();
     double msecsPerFrame = (now - frame0) / (numFrames-1); // Sub one to account for intervals vs endpoints
     printf("Avg. msecs/frame: %f\n", msecsPerFrame);
-#ifdef REPORT_RESULT
-    int result = (msecsPerFrame < 5); // Expecting to run extremely fast unthrottled, and certainly not bounded by vsync, so less than common 16.667 msecs per frame (this is assuming 60hz display)
-    REPORT_RESULT(result);
-#endif
     emscripten_cancel_main_loop();
+    // Expecting to run extremely fast unthrottled, and certainly not bounded by
+    // vsync, so less than common 16.667 msecs per frame (this is assuming 60hz
+    // display)
+    exit((msecsPerFrame < 5) ? 0 : 1);
   }
 }
 
 int main() {
   emscripten_set_main_loop(looper, 1, 0);
   emscripten_set_main_loop_timing(EM_TIMING_SETIMMEDIATE, 0);
+  return 99;
 }