Convert all sdl tests to btest_exit. NFC (#17467)

Author: sbc100

tests/sdl2_audio_beep.cpp

@@ -177,9 +177,6 @@ void nextTest(void *unused = 0) {
         printf("All tests done. Quit.\n");
 #ifdef __EMSCRIPTEN__
         emscripten_cancel_main_loop();
-#ifdef REPORT_RESULT
-        REPORT_RESULT(1);
-#endif
 #endif
         return;
       }
@@ -236,7 +233,10 @@ int main(int argc, char** argv) {
   SDL_Init(SDL_INIT_AUDIO);
 
   nextTest();
-   
+
+  if (!beep)
+    return 1;
+
 #ifdef __EMSCRIPTEN__
   emscripten_set_main_loop(update, 60, 0);
 #else

tests/sdl2_canvas_size.c

@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
 
     SDL_DestroyWindow(window);
     SDL_Quit();
-    REPORT_RESULT(1);
 
     return 0;
 }

tests/sdl2_canvas_write.cpp

@@ -3,6 +3,7 @@
 // University of Illinois/NCSA Open Source License.  Both these licenses can be
 // found in the LICENSE file.
 
+#include <assert.h>
 #include <SDL.h>
 #include <emscripten.h>
 
@@ -32,7 +33,7 @@ void draw(SDL_Window *window, SDL_Surface *surface) {
         sdlError("SDL_UpdateWindowSurface");
 }
 
-int verify(void) {
+void verify(void) {
     int res = EM_ASM_INT({
         var ctx = Module['canvas'].getContext('2d');
         var data = ctx.getImageData(0, 0, 256, 256).data;
@@ -52,7 +53,7 @@ int verify(void) {
     });
 
     printf("%s\n", res ? "FAIL" : "PASS");
-    return res;
+    assert(res == 0);
 }
 
 int main(void) {
@@ -71,7 +72,6 @@ int main(void) {
 
     draw(window, surface);
 
-    int result = verify();
-    REPORT_RESULT(result);
+    verify();
+    return 0;
 }
-

tests/sdl2_custom_cursor.c

@@ -50,7 +50,6 @@ int main(int argc, char *argv[])
 
     SDL_DestroyWindow(window);
     SDL_Quit();
-    REPORT_RESULT(1);
 
     return 0;
 }

tests/sdl2_gl_read.c

@@ -141,8 +141,8 @@ void Verify() {
     ok = ok && (data[x*4+0] == 0);
     ok = ok && (data[x*4+1] == 0);
   }
-  int result = seen && ok;
-  REPORT_RESULT(result);
+  assert(seen);
+  assert(ok);
 }
 
 int main(int argc, char *argv[])

tests/sdl2_image.c

@@ -63,7 +63,7 @@ int main() {
 
   int result = 0;
 
-  result |= testImage(renderer, SCREENSHOT_DIRNAME "/" SCREENSHOT_BASENAME); // absolute path
+  result = testImage(renderer, SCREENSHOT_DIRNAME "/" SCREENSHOT_BASENAME); // absolute path
   assert(result != 0);
 
   chdir(SCREENSHOT_DIRNAME);
@@ -76,8 +76,6 @@ int main() {
 
   SDL_Quit();
 
-  REPORT_RESULT(result);
-
-  return 0;
+  return result;
 }
 

tests/sdl2_key.c

@@ -13,7 +13,7 @@ int result = 1;
 
 int EventHandler(void *userdata, SDL_Event *event) {
   int mod;
-  
+
   switch(event->type) {
     case SDL_KEYUP:
       break;
@@ -29,9 +29,8 @@ int EventHandler(void *userdata, SDL_Event *event) {
             printf("b scancode\n"); result *= 23; break;
           }
           printf("unknown key: sym %d scancode %d\n", event->key.keysym.sym, event->key.keysym.scancode);
-          REPORT_RESULT(result);
-          emscripten_run_script("throw 'done'"); // comment this out to leave event handling active. Use the following to log DOM keys:
-                                                 // addEventListener('keyup', function(event) { console.log(event->keyCode) }, true)
+          emscripten_force_exit(result); // comment this out to leave event handling active. Use the following to log DOM keys:
+                                         // addEventListener('keyup', function(event) { console.log(event->keyCode) }, true)
         }
       }
       break;
@@ -78,6 +77,7 @@ int main(int argc, char **argv) {
   emscripten_run_script("keydown(66);keyup(66);"); // b
   emscripten_run_script("keydown(100);keyup(100);"); // trigger the end
 
-  return 0;
+  emscripten_exit_with_live_runtime();
+  return 99;
 }
 

tests/sdl2_misc.c

@@ -13,8 +13,6 @@
 
 #include <emscripten.h>
 
-#include "report_result.h"
-
 int main(int argc, char *argv[])
 {
     SDL_Window *window;

tests/sdl2_mixer_music.c

@@ -14,9 +14,7 @@ void main2()
 	emscripten_cancel_main_loop();
 	Mix_FreeMusic(music);
 	Mix_CloseAudio();
-#ifdef REPORT_RESULT
-	REPORT_RESULT(1);
-#endif
+	emscripten_force_exit(0);
 }
 
 int main(int argc, char* argv[])

tests/sdl2_mouse.c

@@ -10,7 +10,6 @@
 #include <assert.h>
 #include <emscripten.h>
 
-int result = 1;
 int mouse_motions = 0;
 
 #define abs(x) ((x) < 0 ? -(x) : (x))
@@ -45,8 +44,7 @@ void one() {
       case SDL_MOUSEBUTTONDOWN: {
         SDL_MouseButtonEvent *m = (SDL_MouseButtonEvent*)&event;
         if (m->button == 2) {
-          REPORT_RESULT(result);
-          emscripten_run_script("throw 'done'");
+          emscripten_force_exit(0);
         }
         printf("button down : %d,%d  %d,%d\n", m->button, m->state, m->x, m->y);
 #ifdef TEST_SDL_MOUSE_OFFSETS
@@ -88,7 +86,7 @@ int main() {
 
   emscripten_async_call(main_2, NULL, 3000); // avoid startup delays and intermittent errors
 
-  return 0;
+  return 99;
 }
 
 void main_2(void* arg) {