Cleanup event loop tests. NFC

The browser tests were only being run in PROXY_TO_PTHREAD mode for
some reason even though these tests should pass on the main thread.

In test_other the `PROXY_TO_PTHREAD` flags were being passed as args
(rather then emcc_arggs).  Likely a copy/paste bug.

Author: sbc100

test/emscripten_performance_now.c

@@ -12,9 +12,7 @@ void test(void *userData) {
   double now3 = emscripten_date_now();
   assert(now3 >= dateNow + 100);
 
-#ifdef REPORT_RESULT
-  REPORT_RESULT(0);
-#endif
+  exit(0);
 }
 
 int main() {
@@ -30,4 +28,5 @@ int main() {
 #else
   emscripten_set_timeout(test, 200, 0);
 #endif
+  return 99;
 }

test/emscripten_set_interval.c

@@ -7,6 +7,7 @@
 int funcExecuted = 0;
 
 void testDone(void *userData) {
+  printf("testDone\n");
   assert((long)userData == 2);
   assert(funcExecuted == 10);
   exit(0);
@@ -15,6 +16,7 @@ void testDone(void *userData) {
 long intervalId = 0;
 
 void tick(void *userData) {
+  printf("tick: %d\n", funcExecuted);
   assert((long)userData == 1);
   ++funcExecuted;
   if (funcExecuted == 10) {
@@ -28,6 +30,5 @@ void tick(void *userData) {
 
 int main() {
   intervalId = emscripten_set_interval(tick, 100, (void*)1);
-  emscripten_exit_with_live_runtime();
   return 99;
 }

test/emscripten_set_timeout.c

@@ -1,34 +1,35 @@
 #include <emscripten/emscripten.h>
 #include <emscripten/html5.h>
-#include <emscripten/em_asm.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 int func1Executed = 0;
 int func2Executed = 0;
 
 void func1(void *userData);
 
 void func2(void *userData) {
+  printf("func2: %d\n", func2Executed);
   assert((long)userData == 2);
   ++func2Executed;
 
-  if (func2Executed == 1)
-  {
+  if (func2Executed == 1) {
     // Test canceling a setTimeout: register a callback but then cancel it immediately
     long id = emscripten_set_timeout(func1, 10, (void*)2);
     emscripten_clear_timeout(id);
 
     emscripten_set_timeout(func2, 100, (void*)2);
   }
-  if (func2Executed == 2)
-  {
+
+  if (func2Executed == 2) {
     assert(func1Executed == 1);
     exit(0);
   }
 }
 
 void func1(void *userData) {
+  printf("func1\n");
   assert((long)userData == 1);
   ++func1Executed;
 
@@ -39,6 +40,5 @@ void func1(void *userData) {
 
 int main() {
   emscripten_set_timeout(func1, 100, (void*)1);
-  emscripten_exit_with_live_runtime();
   return 99;
 }

test/emscripten_set_timeout_loop.c

@@ -1,32 +1,34 @@
 #include <emscripten/emscripten.h>
 #include <emscripten/html5.h>
-#include <emscripten/em_asm.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 double previousSetTimeouTime = 0;
 int funcExecuted = 0;
 
 void testDone(void *userData) {
+  printf("testDone\n");
   assert((long)userData == 2);
   assert(funcExecuted == 10);
+  emscripten_runtime_keepalive_pop();
   exit(0);
 }
 
 bool tick(double time, void *userData) {
+  printf("tick: %d\n", funcExecuted);
   assert(time >= previousSetTimeouTime);
   previousSetTimeouTime = time;
   assert((long)userData == 1);
   ++funcExecuted;
-  if (funcExecuted == 10)
-  {
+  if (funcExecuted == 10) {
     emscripten_set_timeout(testDone, 300, (void*)2);
   }
   return funcExecuted < 10;
 }
 
 int main() {
   emscripten_set_timeout_loop(tick, 100, (void*)1);
-  emscripten_exit_with_live_runtime();
+  emscripten_runtime_keepalive_push();
   return 99;
 }

test/test_browser.py

@@ -205,6 +205,21 @@ def decorated(self, threads, *args, **kwargs):
   return decorated
 
 
+def also_with_proxy_to_pthread(f):
+  assert callable(f)
+
+  @wraps(f)
+  def decorated(self, threads, *args, **kwargs):
+    if threads:
+      self.emcc_args += ['-pthread', '-sPROXY_TO_PTHREAD']
+    f(self, *args, **kwargs)
+
+  parameterize(decorated, {'': (False,),
+                           'pthreads': (True,)})
+
+  return decorated
+
+
 def skipExecIf(cond, message):
   def decorator(f):
     assert callable(f)
@@ -4932,24 +4947,28 @@ def test_emscripten_request_animation_frame_loop(self):
   def test_request_animation_frame(self):
     self.btest_exit('test_request_animation_frame.c')
 
+  @also_with_proxy_to_pthread
   def test_emscripten_set_timeout(self):
-    self.btest_exit('emscripten_set_timeout.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.btest_exit('emscripten_set_timeout.c')
 
+  @also_with_proxy_to_pthread
   def test_emscripten_set_timeout_loop(self):
-    self.btest_exit('emscripten_set_timeout_loop.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.btest_exit('emscripten_set_timeout_loop.c')
 
   def test_emscripten_set_immediate(self):
     self.btest_exit('emscripten_set_immediate.c')
 
   def test_emscripten_set_immediate_loop(self):
     self.btest_exit('emscripten_set_immediate_loop.c')
 
+  @also_with_proxy_to_pthread
   def test_emscripten_set_interval(self):
-    self.btest_exit('emscripten_set_interval.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.btest_exit('emscripten_set_interval.c')
 
   # Test emscripten_performance_now() and emscripten_date_now()
+  @also_with_proxy_to_pthread
   def test_emscripten_performance_now(self):
-    self.btest('emscripten_performance_now.c', '0', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.btest_exit('emscripten_performance_now.c')
 
   def test_embind_with_pthreads(self):
     self.btest_exit('embind/test_pthreads.cpp', args=['-lembind', '-pthread', '-sPTHREAD_POOL_SIZE=2'])

test/test_other.py

@@ -13883,9 +13883,8 @@ def test_pthread_trap(self):
   def test_pthread_kill(self):
     self.do_run_in_out_file_test('pthread/test_pthread_kill.c')
 
-  @node_pthreads
   def test_emscripten_set_interval(self):
-    self.do_runf('emscripten_set_interval.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.do_runf('emscripten_set_interval.c')
 
   # Test emscripten_console_log(), emscripten_console_warn() and emscripten_console_error()
   def test_emscripten_console_log(self):
@@ -13895,13 +13894,11 @@ def test_emscripten_console_log(self):
   def test_emscripten_unwind_to_js_event_loop(self):
     self.do_runf('test_emscripten_unwind_to_js_event_loop.c')
 
-  @node_pthreads
   def test_emscripten_set_timeout(self):
-    self.do_runf('emscripten_set_timeout.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.do_runf('emscripten_set_timeout.c')
 
-  @node_pthreads
   def test_emscripten_set_timeout_loop(self):
-    self.do_runf('emscripten_set_timeout_loop.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.do_runf('emscripten_set_timeout_loop.c')
 
   # Verify that we are able to successfully compile a script when the Windows 7
   # and Python workaround env. vars are enabled.