finish box2d benchmark

2 files changed, 9 insertions, 5 deletions

diff --git a/tests/box2d/Benchmark.cpp b/tests/box2d/Benchmark.cpp
index 46dbbcb0..8ebf0457 100644
--- a/tests/box2d/Benchmark.cpp
+++ b/tests/box2d/Benchmark.cpp
@@ -11,7 +11,7 @@
 #define DEBUG 0
 
 #define WARMUP 64
-#define FRAMES 256
+#define FRAMES 333
 
 typedef struct {
   float mean;
@@ -52,7 +52,7 @@ result_t measure(clock_t times[FRAMES]) {
   return r;
 }
 
-result_t bench() {
+int main() {
 	// Define the gravity vector.
 	b2Vec2 gravity(0.0f, -10.0f);
 
@@ -116,6 +116,10 @@ result_t bench() {
 #endif
 	}
 
-  return measure(times);
+  result_t result = measure(times);
+
+  printf("frame averages: %.3f +- %.3f\n", result.mean, result.stddev);
+
+  return 0;
 }
 
diff --git a/tests/runner.py b/tests/runner.py
index eb6fb110..2865679b 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -12376,7 +12376,7 @@ ok.
 ''',
                         force_c=True, emcc_args=emcc_args, native_args=native_args)
 
-    def zzztest_yyy_box2d(self): # Called thus so it runs late in the alphabetical cycle... it is long
+    def test_yyy_box2d(self): # Called thus so it runs late in the alphabetical cycle... it is long
       src = open(path_from_root('tests', 'box2d', 'Benchmark.cpp'), 'r').read()
 
       js_lib = self.get_library('box2d', [os.path.join('box2d.a')], configure=None)
@@ -12385,7 +12385,7 @@ ok.
       emcc_args = js_lib + ['-I' + path_from_root('tests', 'box2d')]
       native_args = native_lib + ['-I' + path_from_root('tests', 'box2d')]
 
-      self.do_benchmark('box2d', src, [], '\nok.\n', emcc_args=emcc_args, native_args=native_args)
+      self.do_benchmark('box2d', src, [], 'frame averages', emcc_args=emcc_args, native_args=native_args)
 
     def test_zzz_bullet(self): # Called thus so it runs late in the alphabetical cycle... it is long
       src = open(path_from_root('tests', 'bullet', 'Demos', 'Benchmarks', 'BenchmarkDemo.cpp'), 'r').read() + \