8 files changed, 35 insertions, 10 deletions
diff --git a/tests/hello_world_sdl.cpp b/tests/hello_world_sdl.cpp
index b6401995..eeaad0cd 100644
--- a/tests/hello_world_sdl.cpp
+++ b/tests/hello_world_sdl.cpp
@@ -2,7 +2,7 @@
 #include <SDL/SDL.h>
 
 
-int main() {
+extern "C" int main(int argc, char** argv) {
   printf("hello, world!\n");
 
   SDL_Init(SDL_INIT_VIDEO);
@@ -11,10 +11,8 @@ int main() {
   if (SDL_MUSTLOCK(screen)) SDL_LockSurface(screen);
   for (int i = 0; i < 256; i++) {
     for (int j = 0; j < 256; j++) {
-      *((char*)screen->pixels + i*256*4 + j*4 + 0) = i;
-      *((char*)screen->pixels + i*256*4 + j*4 + 1) = j;
-      *((char*)screen->pixels + i*256*4 + j*4 + 2) = 255-i;
-      *((char*)screen->pixels + i*256*4 + j*4 + 3) = (i+j)%255; // actually ignored, since this is to the screen
+      // alpha component is actually ignored, since this is to the screen
+      *((Uint32*)screen->pixels + i * 256 + j) = SDL_MapRGBA(screen->format, i, j, 255-i, (i+j) % 255);
     }
   }
   if (SDL_MUSTLOCK(screen)) SDL_UnlockSurface(screen);
diff --git a/tests/runner.py b/tests/runner.py
index 5796240d..553c7b4d 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -11542,6 +11542,9 @@ elif 'browser' in str(sys.argv):
             result = q.get()
           s.wfile.write(result)
         s.wfile.close()
+      def log_request(code=0, size=0):
+        # don't log; too noisy
+        pass
     httpd = BaseHTTPServer.HTTPServer(('localhost', 9999), TestServerHandler)
     httpd.serve_forever() # test runner will kill us
 
@@ -11562,6 +11565,9 @@ elif 'browser' in str(sys.argv):
             s.send_response(500)
             s.send_header("Content-type", "text/html")
             s.end_headers()
+      def log_request(code=0, size=0):
+        # don't log; too noisy
+        pass
     os.chdir(dir)
     httpd = BaseHTTPServer.HTTPServer(('localhost', 8888), TestServerHandler)
     httpd.serve_forever() # test runner will kill us
@@ -12836,6 +12842,9 @@ elif 'browser' in str(sys.argv):
     def test_cube_explosion(self):
       self.btest('cube_explosion.c', expected=['667220544', '-1543354600', '-1485258415'])
 
+    def test_sdl_canvas_blank(self):
+      self.btest('sdl_canvas_blank.c', reference='sdl_canvas_blank.png')
+
     def test_sdl_canvas_palette(self):
       self.btest('sdl_canvas_palette.c', reference='sdl_canvas_palette.png')
 
diff --git a/tests/sdl_canvas.c b/tests/sdl_canvas.c
index 97cd1348..10044ff4 100644
--- a/tests/sdl_canvas.c
+++ b/tests/sdl_canvas.c
@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
 
   // fill stuff
   SDL_Rect rect = { 200, 200, 175, 125 };
-  SDL_FillRect(screen, &rect, 0x2222ffff);
+  SDL_FillRect(screen, &rect, SDL_MapRGBA(screen->format, 0x22, 0x22, 0xff, 0xff));
 
   SDL_Flip(screen); 
 
diff --git a/tests/sdl_canvas_blank.c b/tests/sdl_canvas_blank.c
new file mode 100644
index 00000000..0e7607a6
--- /dev/null
+++ b/tests/sdl_canvas_blank.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include <SDL/SDL.h>
+
+
+int main() {
+  SDL_Init(SDL_INIT_VIDEO);
+  SDL_Surface *screen = SDL_SetVideoMode(256, 256, 32, SDL_SWSURFACE);
+
+  if (SDL_MUSTLOCK(screen)) SDL_LockSurface(screen);
+  if (SDL_MUSTLOCK(screen)) SDL_UnlockSurface(screen);
+  SDL_Flip(screen); 
+
+  SDL_Quit();
+
+  return 0;
+}
+
diff --git a/tests/sdl_canvas_blank.png b/tests/sdl_canvas_blank.png
new file mode 100644
index 00000000..dc5a4a26
--- /dev/null
+++ b/tests/sdl_canvas_blank.png
diff --git a/tests/sdl_canvas_twice.c b/tests/sdl_canvas_twice.c
index 6c6e4802..28a7a01c 100644
--- a/tests/sdl_canvas_twice.c
+++ b/tests/sdl_canvas_twice.c
@@ -8,12 +8,12 @@ int main(int argc, char **argv) {
   SDL_Init(SDL_INIT_VIDEO);
   SDL_Surface *screen = SDL_SetVideoMode(40, 40, 32, SDL_SWSURFACE);
 
-  SDL_FillRect(screen, NULL, 0xff0000ff);
+  SDL_FillRect(screen, NULL, SDL_MapRGBA(screen->format, 0xff, 0, 0, 0xff));
   SDL_LockSurface(screen);
   *((int*)screen->pixels + 95) = 0;
   SDL_UnlockSurface(screen);
 
-  SDL_FillRect(screen, NULL, 0x00ff00ff); // wipe out previous pixel and fill
+  SDL_FillRect(screen, NULL, SDL_MapRGBA(screen->format, 0, 0xff, 0, 0xff)); // wipe out previous pixel and fill
   SDL_LockSurface(screen);
   *((int*)screen->pixels + 205) = 0;
   SDL_UnlockSurface(screen);
diff --git a/tests/sdl_image_prepare_data.c b/tests/sdl_image_prepare_data.c
index 87e33399..d45a2e60 100644
--- a/tests/sdl_image_prepare_data.c
+++ b/tests/sdl_image_prepare_data.c
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_image.h>
 #include <assert.h>
@@ -43,7 +45,7 @@ void ready(void *arg, const char *fileName) {
 
     testImage(seenName);
 
-    free(seenName); // As the API docs say, we are responsible for freeing the 'fake' names we are given
+    free((void*)seenName); // As the API docs say, we are responsible for freeing the 'fake' names we are given
 
     SDL_Flip(screen);
   }
diff --git a/tests/sdl_maprgba.c b/tests/sdl_maprgba.c
index c87c7524..4b5c0026 100644
--- a/tests/sdl_maprgba.c
+++ b/tests/sdl_maprgba.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <SDL/SDL.h>
-#include <emscripten.h>
 
 int main() {
   Uint32 c;