fix test_glgears

4 files changed, 5 insertions, 5 deletions

diff --git a/src/library_gl.js b/src/library_gl.js
index 3672b2f0..1fed366e 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -1038,7 +1038,7 @@ var LibraryGLUT = {
                                        Module['canvas'].height);
     }
     _glutPostRedisplay();
-    throw "Entering GLUT mainloop";
+    //throw "Entering GLUT mainloop";
   },
 
 };
diff --git a/system/include/libc/sys/types.h b/system/include/libc/sys/types.h
index 7fc4be21..77acc92e 100644
--- a/system/include/libc/sys/types.h
+++ b/system/include/libc/sys/types.h
@@ -140,6 +140,7 @@ typedef unsigned long vm_size_t;
 
 #define __BIT_TYPES_DEFINED__
 
+// XXX Emscripten: removed unsigned types which are already defined
 typedef signed char int8_t;
 typedef short int16_t;
 typedef int int32_t;
diff --git a/tests/gears.png b/tests/gears.png
new file mode 100644
index 00000000..6a30d534
--- /dev/null
+++ b/tests/gears.png
diff --git a/tests/runner.py b/tests/runner.py
index 431a1c6e..c1d2dc2b 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -6857,14 +6857,13 @@ elif 'browser' in str(sys.argv):
       self.run_browser('main.html', 'You should see that the worker was called, and said "hello from worker!"')
 
     def test_glgears(self):
-      # test the OpenGL ES implementation
+      self.reftest(path_from_root('tests', 'gears.png'))
       output = Popen(['python', EMCC, path_from_root('tests', 'hello_world_gles.c'), '-o', 'something.html',
-                                           '-DHAVE_BUILTIN_SINCOS',
-                                           '--shell-file', path_from_root('tests', 'hello_world_gles_shell.html')],
+                                           '-DHAVE_BUILTIN_SINCOS', '--pre-js', 'reftest.js'],
                      stdout=PIPE, stderr=PIPE).communicate()
       assert len(output[0]) == 0, output[0]
       assert os.path.exists('something.html'), output
-      self.run_browser('something.html', 'You should see animating gears.', '/report_gl_result?true')
+      self.run_browser('something.html', 'You should see animating gears.', '/report_result?0')
 
     def test_glgears_bad(self):
       # Make sure that OpenGL ES is not available if typed arrays are not used