Merge branch 'master' into llvmsvn

1 files changed, 18 insertions, 8 deletions

diff --git a/tests/sdl_image.c b/tests/sdl_image.c
index d934f863..9d8c36f2 100644
--- a/tests/sdl_image.c
+++ b/tests/sdl_image.c
@@ -4,30 +4,40 @@
 #include <assert.h>
 #include <emscripten.h>
 
-int main() {
-  SDL_Init(SDL_INIT_VIDEO);
-  SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_SWSURFACE);
-
-  SDL_Surface *image = IMG_Load("screenshot.jpg");
+int testImage(SDL_Surface* screen, const char* fileName) {
+  SDL_Surface *image = IMG_Load(fileName);
   if (!image)
   {
      printf("IMG_Load: %s\n", IMG_GetError());
-     return 1;
+     return 0;
   }
   assert(image->format->BitsPerPixel == 32);
   assert(image->format->BytesPerPixel == 4);
   assert(image->pitch == 4*image->w);
+  int result = image->w;
 
   SDL_BlitSurface (image, NULL, screen, NULL);
   SDL_FreeSurface (image);
 
-  SDL_Flip(screen); 
+  return result;
+}
+
+int main() {
+  SDL_Init(SDL_INIT_VIDEO);
+  SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_SWSURFACE);
+
+  int result = 0;
+  result = testImage(screen, "screenshot.jpg"); // relative path
+  assert(result != 0);
+  result |= testImage(screen, "/screenshot.jpg"); // absolute path
+  assert(result != 0);
+
+  SDL_Flip(screen);
 
   printf("you should see an image.\n");
 
   SDL_Quit();
 
-  int result = image->w;
   REPORT_RESULT();
 
   return 0;