Add automation for sdl palette test

5 files changed, 50 insertions, 36 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 9280bd8e..06b74caa 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -10389,12 +10389,28 @@ elif 'browser' in str(sys.argv):
       shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'example.png'))
       self.btest('sdl_rotozoom.c', reference='sdl_rotozoom.png', args=['--preload-file', 'example.png'])
 
-    def zzztest_sdl_canvas_palette_2(self): # XXX disabled until we have proper automation
-      open(os.path.join(self.get_dir(), 'sdl_canvas_palette_2.c'), 'w').write(self.with_report_result(open(path_from_root('tests', 'sdl_canvas_palette_2.c')).read()))
-      open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('Module[\'preRun\'] = function() { SDL.defaults.copyOnLock = false }')
+    def test_sdl_canvas_palette_2(self):
+      open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
+        Module['preRun'].push(function() { 
+          SDL.defaults.copyOnLock = false;
+        });
+      ''')
+
+      open(os.path.join(self.get_dir(), 'args-r.js'), 'w').write('''
+        Module['arguments'] = ['-r'];
+      ''')
 
-      Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'sdl_canvas_palette_2.c'), '-o', 'page.html', '--pre-js', 'pre.js']).communicate()
-      self.run_browser('page.html', '')
+      open(os.path.join(self.get_dir(), 'args-g.js'), 'w').write('''
+        Module['arguments'] = ['-g'];
+      ''')
+
+      open(os.path.join(self.get_dir(), 'args-b.js'), 'w').write('''
+        Module['arguments'] = ['-b'];
+      ''')
+        
+      self.btest('sdl_canvas_palette_2.c', reference='sdl_canvas_palette_r.png', args=['--pre-js', 'pre.js', '--pre-js', 'args-r.js'])
+      self.btest('sdl_canvas_palette_2.c', reference='sdl_canvas_palette_g.png', args=['--pre-js', 'pre.js', '--pre-js', 'args-g.js'])
+      self.btest('sdl_canvas_palette_2.c', reference='sdl_canvas_palette_b.png', args=['--pre-js', 'pre.js', '--pre-js', 'args-b.js'])
 
     def test_glbegin_points(self):
       shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'screenshot.png'))
diff --git a/tests/sdl_canvas_palette_2.c b/tests/sdl_canvas_palette_2.c
index db9c3207..11d727ac 100644
--- a/tests/sdl_canvas_palette_2.c
+++ b/tests/sdl_canvas_palette_2.c
@@ -1,59 +1,40 @@
 #include <stdio.h>
 #include <SDL/SDL.h>
 #include <emscripten.h>
+#include <string.h>
 
 static const int COLOR_COUNT = 32;
 
 static SDL_Surface *screen;
 static SDL_Color   pal[COLOR_COUNT +1];
 
-void initializePalette() {
+void pallete(int red, int green, int blue) {
   //initialize sdl palette
-  //with red green and blue
-  //colors
+  //with gradient colors
   pal[0].r = 0;
   pal[0].g = 0;
   pal[0].b = 0;
   pal[0].unused = 0;
 
   for (int i=1; i< 1 + COLOR_COUNT; i++) {
-    pal[i].r = 255 / COLOR_COUNT * i;
-    pal[i].g = 0;
-    pal[i].b = 0;
+    pal[i].r = (float) red    / COLOR_COUNT * i;
+    pal[i].g = (float) green  / COLOR_COUNT * i;
+    pal[i].b = (float) blue   / COLOR_COUNT * i;
     pal[i].unused = 0;
   }
 
   SDL_SetColors(screen, pal, 0, 1 + COLOR_COUNT);
 }
 
-void animatePalette() {
-  SDL_Color temporary;
-  temporary = pal[1];
-  for (int i=2; i< 1 + COLOR_COUNT; i++) {
-    pal[i-1] = pal[i];
-  }
-  pal[COLOR_COUNT] = temporary;
-
-  SDL_SetColors(screen, pal, 1, COLOR_COUNT);
-
-  //refreshing
-  SDL_LockSurface(screen);
-  SDL_UnlockSurface(screen);
-
-  printf("yet another cycle\n");
-}
-
-int main() {
+int main(int argc, char** argv) {
   SDL_Init(SDL_INIT_VIDEO);
-  screen = SDL_SetVideoMode(600, 400, 8, SDL_HWSURFACE | SDL_HWPALETTE);
+  screen = SDL_SetVideoMode(600, 450, 8, SDL_HWSURFACE | SDL_HWPALETTE);
 
   //test empty pallete
   SDL_LockSurface(screen);
   SDL_UnlockSurface(screen);
 
-  initializePalette();
-
-  //palette is red yellow blue
+  //Draw gradient
   SDL_LockSurface(screen);
   int size = screen->h * screen->pitch;
   char *color   = screen->pixels;
@@ -66,9 +47,26 @@ int main() {
   }
   SDL_UnlockSurface(screen);
 
-  //Animation
-  printf("you should see red gradient animation\n");
-  emscripten_set_main_loop(animatePalette, 0, 1);
+  //Set pallete
+  if (argc > 1) {
+    printf("%s\n", argv[1]);
+    if (strcmp(argv[1], "-r") == 0) {
+      printf("set [red]\n");
+      pallete(255, 0, 0);
+    }
+    if (strcmp(argv[1], "-g") == 0) {
+      printf("set [green]\n");
+      pallete(0, 255, 0);
+    }
+    if (strcmp(argv[1], "-b") == 0) {
+      printf("set [blue]\n");
+      pallete(0, 0, 255);
+    }
+  }
+
+  //refreshing
+  SDL_LockSurface(screen);
+  SDL_UnlockSurface(screen);
 
   SDL_Quit();
 
diff --git a/tests/sdl_canvas_palette_b.png b/tests/sdl_canvas_palette_b.png
new file mode 100644
index 00000000..54ed7e9a
--- /dev/null
+++ b/tests/sdl_canvas_palette_b.png
diff --git a/tests/sdl_canvas_palette_g.png b/tests/sdl_canvas_palette_g.png
new file mode 100644
index 00000000..a2a5484d
--- /dev/null
+++ b/tests/sdl_canvas_palette_g.png
diff --git a/tests/sdl_canvas_palette_r.png b/tests/sdl_canvas_palette_r.png
new file mode 100644
index 00000000..29b8226b
--- /dev/null
+++ b/tests/sdl_canvas_palette_r.png