Remove now-invalid tests.

3 files changed, 80 insertions, 548 deletions

diff --git a/tests/gl_ps_workaround.c b/tests/gl_ps_workaround.c
deleted file mode 100644
index 268eaf22..00000000
--- a/tests/gl_ps_workaround.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************
- *                                                                 *
- *                        Using SDL With OpenGL                    *
- *                                                                 *
- *                    Tutorial by Kyle Foley (sdw)                 *
- *                                                                 *
- * http://gpwiki.org/index.php/SDL:Tutorials:Using_SDL_with_OpenGL *
- *                                                                 *
- *******************************************************************/
-
-/*
-THIS WORK, INCLUDING THE SOURCE CODE, DOCUMENTATION
-AND RELATED MEDIA AND DATA, IS PLACED INTO THE PUBLIC DOMAIN.
-
-THE ORIGINAL AUTHOR IS KYLE FOLEY.
-
-THIS SOFTWARE IS PROVIDED AS-IS WITHOUT WARRANTY
-OF ANY KIND, NOT EVEN THE IMPLIED WARRANTY OF
-MERCHANTABILITY. THE AUTHOR OF THIS SOFTWARE,
-ASSUMES _NO_ RESPONSIBILITY FOR ANY CONSEQUENCE
-RESULTING FROM THE USE, MODIFICATION, OR
-REDISTRIBUTION OF THIS SOFTWARE.
-*/
-
-#if !EMSCRIPTEN
-#define USE_GLEW 1
-#endif
-
-#if USE_GLEW
-#include "GL/glew.h"
-#endif
-
-#include "SDL/SDL.h"
-#include "SDL/SDL_image.h"
-#if !USE_GLEW
-#include "SDL/SDL_opengl.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-void shaders() {
-#if USE_GLEW
-  glewInit();
-#endif
-
-  GLint ok;
-
-  const char *vertexShader = "void main(void) \n"
-                             "{ \n"
-                             "    gl_Position = ftransform(); \n"
-                             "    gl_TexCoord[0] = gl_MultiTexCoord0; \n"
-                             "    gl_FrontColor = gl_Color; \n"
-                             "} \n";
-  const char *fragmentShader = "uniform sampler2D tex0; \n"
-                               "void main(void) \n"
-                               "{ \n"
-                               "    gl_FragColor = gl_Color * texture2D(tex0, gl_TexCoord[0].xy); \n"
-                               "} \n";
-
-  GLuint vs = glCreateShader(GL_VERTEX_SHADER);
-  glShaderSource(vs, 1, &vertexShader, NULL);
-  glCompileShader(vs);
-  glGetShaderiv(vs, GL_COMPILE_STATUS, &ok);
-  assert(ok);
-
-  GLuint fs = glCreateShader(GL_FRAGMENT_SHADER);
-  glShaderSource(fs, 1, &fragmentShader, NULL);
-  glCompileShader(fs);
-  glGetShaderiv(fs, GL_COMPILE_STATUS, &ok);
-  assert(ok);
-
-  GLuint program = glCreateProgram();
-
-  glAttachShader(program, vs);
-  glAttachShader(program, fs);
-  glLinkProgram(program);
-  glGetProgramiv(program, GL_LINK_STATUS, &ok);
-  assert(ok);
-
-  glUseProgram(program);
-}
-
-int main(int argc, char *argv[])
-{
-    SDL_Surface *screen;
-
-    // Slightly different SDL initialization
-    if ( SDL_Init(SDL_INIT_VIDEO) != 0 ) {
-        printf("Unable to initialize SDL: %s\n", SDL_GetError());
-        return 1;
-    }
-
-    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 ); // *new*
-
-    screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL ); // *changed*
-    if ( !screen ) {
-        printf("Unable to set video mode: %s\n", SDL_GetError());
-        return 1;
-    }
-
-    // Set the OpenGL state after creating the context with SDL_SetVideoMode
-
-    glClearColor( 0, 0, 0, 0 );
-
-#if !EMSCRIPTEN
-    glEnable( GL_TEXTURE_2D ); // Need this to display a texture XXX unnecessary in OpenGL ES 2.0/WebGL
-#endif
-
-    glViewport( 0, 0, 640, 480 );
-
-    glMatrixMode( GL_PROJECTION );
-    GLfloat matrixData[] = { 2.0/640,        0,  0,  0,
-                                   0, -2.0/480,  0,  0,
-                                   0,        0, -1,  0,
-                                  -1,        1,  0,  1 };
-    glLoadMatrixf(matrixData); // test loadmatrix
-
-    glMatrixMode( GL_MODELVIEW );
-    glLoadIdentity();
-
-    // Load the OpenGL texture
-
-    GLuint texture; // Texture object handle
-    SDL_Surface *surface; // Gives us the information to make the texture
-
-    if ( (surface = IMG_Load("screenshot.png")) ) {
-
-        // Check that the image's width is a power of 2
-        if ( (surface->w & (surface->w - 1)) != 0 ) {
-            printf("warning: image.bmp's width is not a power of 2\n");
-        }
-
-        // Also check if the height is a power of 2
-        if ( (surface->h & (surface->h - 1)) != 0 ) {
-            printf("warning: image.bmp's height is not a power of 2\n");
-        }
-
-        // Have OpenGL generate a texture object handle for us
-        glGenTextures( 1, &texture );
-
-        // Bind the texture object
-        glBindTexture( GL_TEXTURE_2D, texture );
-
-        // Set the texture's stretching properties
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-
-        //SDL_LockSurface(surface);
-
-        // Add some greyness
-        memset(surface->pixels, 0x66, surface->w*surface->h);
-
-        // Edit the texture object's image data using the information SDL_Surface gives us
-        glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, surface->w, surface->h, 0,
-                      GL_RGBA, GL_UNSIGNED_BYTE, surface->pixels );
-
-        //SDL_UnlockSurface(surface);
-    }
-    else {
-        printf("SDL could not load image.bmp: %s\n", SDL_GetError());
-        SDL_Quit();
-        return 1;
-    }
-
-    // Free the SDL_Surface only if it was successfully created
-    if ( surface ) {
-        SDL_FreeSurface( surface );
-    }
-
-    // Clear the screen before drawing
-    glClear( GL_COLOR_BUFFER_BIT );
-
-    shaders();
-
-    // Bind the texture to which subsequent calls refer to
-    glBindTexture( GL_TEXTURE_2D, texture );
-
-    // Use clientside vertex pointers to render two items. In this test we have each
-    // attribute in a separate buffer, packed (i.e. stride == 0)
-    GLfloat vertexData[] = {  10,  10,
-                             300,  10,
-                             300, 128,
-                              10, 128,
-                             410,  10,
-                             600,  10,
-                             630, 200,
-                             310, 250,
-                             100, 300,
-                             300, 300,
-                             300, 400,
-                             100, 400 };
-    GLfloat textureData[] = { 0, 0,
-                              1, 0,
-                              1, 1,
-                              0, 1,
-                              0, 0.5,
-                              1, 0.5,
-                              1,   1,
-                              0.5, 1,
-                              0,   0,
-                              1,   0,
-                              1,   1,
-                              0,   1, };
-
-    glEnableClientState(GL_TEXTURE_2D); // XXX should be GL_TEXTURE_COORD_ARRAY); // XXX
-    glTexCoordPointer(2, GL_FLOAT, 0, textureData);
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glVertexPointer(2, GL_FLOAT, 0, vertexData);
-
-    glDrawArrays(GL_QUADS, 0, 12);
-
-    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    glDisableClientState(GL_VERTEX_ARRAY);
-
-    SDL_GL_SwapBuffers();
-
-#if !EMSCRIPTEN
-    // Wait for 3 seconds to give us a chance to see the image
-    SDL_Delay(3000);
-#endif
-
-    // Now we can delete the OpenGL texture and close down SDL
-    glDeleteTextures( 1, &texture );
-
-    SDL_Quit();
-
-    return 0;
-}
diff --git a/tests/gl_ps_workaround2.c b/tests/gl_ps_workaround2.c
deleted file mode 100644
index 55145fa6..00000000
--- a/tests/gl_ps_workaround2.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************
- *                                                                 *
- *                        Using SDL With OpenGL                    *
- *                                                                 *
- *                    Tutorial by Kyle Foley (sdw)                 *
- *                                                                 *
- * http://gpwiki.org/index.php/SDL:Tutorials:Using_SDL_with_OpenGL *
- *                                                                 *
- *******************************************************************/
-
-/*
-THIS WORK, INCLUDING THE SOURCE CODE, DOCUMENTATION
-AND RELATED MEDIA AND DATA, IS PLACED INTO THE PUBLIC DOMAIN.
-
-THE ORIGINAL AUTHOR IS KYLE FOLEY.
-
-THIS SOFTWARE IS PROVIDED AS-IS WITHOUT WARRANTY
-OF ANY KIND, NOT EVEN THE IMPLIED WARRANTY OF
-MERCHANTABILITY. THE AUTHOR OF THIS SOFTWARE,
-ASSUMES _NO_ RESPONSIBILITY FOR ANY CONSEQUENCE
-RESULTING FROM THE USE, MODIFICATION, OR
-REDISTRIBUTION OF THIS SOFTWARE.
-*/
-
-#if !EMSCRIPTEN
-#define USE_GLEW 1
-#endif
-
-#if USE_GLEW
-#include "GL/glew.h"
-#endif
-
-#include "SDL/SDL.h"
-#include "SDL/SDL_image.h"
-#if !USE_GLEW
-#include "SDL/SDL_opengl.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-void shaders() {
-#if USE_GLEW
-  glewInit();
-#endif
-
-  GLint ok;
-
-  const char *vertexShader = "void main(void) \n"
-                             "{ \n"
-                             "    gl_Position = ftransform(); \n"
-                             "    gl_TexCoord[0] = gl_MultiTexCoord0; \n"
-                             "    gl_FrontColor = gl_Color; \n"
-                             "} \n";
-  const char *fragmentShader = "uniform sampler2D tex0; \n"
-                               "void main(void) \n"
-                               "{ \n"
-                               "    gl_FragColor = gl_Color * texture2D(tex0, gl_TexCoord[0].xy); \n"
-                               "} \n";
-
-  GLuint vs = glCreateShader(GL_VERTEX_SHADER);
-  glShaderSource(vs, 1, &vertexShader, NULL);
-  glCompileShader(vs);
-  glGetShaderiv(vs, GL_COMPILE_STATUS, &ok);
-  assert(ok);
-
-  GLuint fs = glCreateShader(GL_FRAGMENT_SHADER);
-  glShaderSource(fs, 1, &fragmentShader, NULL);
-  glCompileShader(fs);
-  glGetShaderiv(fs, GL_COMPILE_STATUS, &ok);
-  assert(ok);
-
-  GLuint program = glCreateProgram();
-
-  glAttachShader(program, vs);
-  glAttachShader(program, fs);
-  glLinkProgram(program);
-  glGetProgramiv(program, GL_LINK_STATUS, &ok);
-  assert(ok);
-
-  glUseProgram(program);
-}
-
-int main(int argc, char *argv[])
-{
-    SDL_Surface *screen;
-
-    // Slightly different SDL initialization
-    if ( SDL_Init(SDL_INIT_VIDEO) != 0 ) {
-        printf("Unable to initialize SDL: %s\n", SDL_GetError());
-        return 1;
-    }
-
-    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 ); // *new*
-
-    screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL ); // *changed*
-    if ( !screen ) {
-        printf("Unable to set video mode: %s\n", SDL_GetError());
-        return 1;
-    }
-
-    // Set the OpenGL state after creating the context with SDL_SetVideoMode
-
-    glClearColor( 0, 0, 0, 0 );
-
-#if !EMSCRIPTEN
-    glEnable( GL_TEXTURE_2D ); // Need this to display a texture XXX unnecessary in OpenGL ES 2.0/WebGL
-#endif
-
-    glViewport( 0, 0, 640, 480 );
-
-    glMatrixMode( GL_PROJECTION );
-    GLfloat matrixData[] = { 2.0/640,        0,  0,  0,
-                                   0, -2.0/480,  0,  0,
-                                   0,        0, -1,  0,
-                                  -1,        1,  0,  1 };
-    glLoadMatrixf(matrixData); // test loadmatrix
-
-    glMatrixMode( GL_MODELVIEW );
-    glLoadIdentity();
-
-    // Load the OpenGL texture
-
-    GLuint texture; // Texture object handle
-    SDL_Surface *surface; // Gives us the information to make the texture
-
-    if ( (surface = IMG_Load("screenshot.png")) ) {
-
-        // Check that the image's width is a power of 2
-        if ( (surface->w & (surface->w - 1)) != 0 ) {
-            printf("warning: image.bmp's width is not a power of 2\n");
-        }
-
-        // Also check if the height is a power of 2
-        if ( (surface->h & (surface->h - 1)) != 0 ) {
-            printf("warning: image.bmp's height is not a power of 2\n");
-        }
-
-        // Have OpenGL generate a texture object handle for us
-        glGenTextures( 1, &texture );
-
-        // Bind the texture object
-        glBindTexture( GL_TEXTURE_2D, texture );
-
-        // Set the texture's stretching properties
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-
-        //SDL_LockSurface(surface);
-
-        // Add some greyness
-        memset(surface->pixels, 0x66, surface->w*surface->h);
-
-        // Edit the texture object's image data using the information SDL_Surface gives us
-        glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, surface->w, surface->h, 0,
-                      GL_RGBA, GL_UNSIGNED_BYTE, surface->pixels );
-
-        //SDL_UnlockSurface(surface);
-    }
-    else {
-        printf("SDL could not load image.bmp: %s\n", SDL_GetError());
-        SDL_Quit();
-        return 1;
-    }
-
-    // Free the SDL_Surface only if it was successfully created
-    if ( surface ) {
-        SDL_FreeSurface( surface );
-    }
-
-    // Clear the screen before drawing
-    glClear( GL_COLOR_BUFFER_BIT );
-
-    shaders();
-
-    // Bind the texture to which subsequent calls refer to
-    glBindTexture( GL_TEXTURE_2D, texture );
-
-    // Use clientside vertex pointers to render two items. In this test we have each
-    // attribute in a separate buffer, packed (i.e. stride == 0)
-    GLfloat vertexData[] = {  10,  10,
-                             300,  10,
-                             300, 128,
-                              10, 128,
-                             410,  10,
-                             600,  10,
-                             630, 200,
-                             310, 250,
-                             100, 300,
-                             300, 300,
-                             300, 400,
-                             100, 400 };
-    GLfloat textureData[] = { 0, 0,
-                              1, 0,
-                              1, 1,
-                              0, 1,
-                              0, 0.5,
-                              1, 0.5,
-                              1,   1,
-                              0.5, 1,
-                              0,   0,
-                              1,   0,
-                              1,   1,
-                              0,   1, };
-
-    glEnable(GL_TEXTURE_2D); // XXX should be GL_TEXTURE_COORD_ARRAY); and also glEnableClientState! XXX two workarounds here
-    glTexCoordPointer(2, GL_FLOAT, 0, textureData);
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glVertexPointer(2, GL_FLOAT, 0, vertexData);
-
-    glDrawArrays(GL_QUADS, 0, 12);
-
-    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    glDisableClientState(GL_VERTEX_ARRAY);
-
-    SDL_GL_SwapBuffers();
-
-#if !EMSCRIPTEN
-    // Wait for 3 seconds to give us a chance to see the image
-    SDL_Delay(3000);
-#endif
-
-    // Now we can delete the OpenGL texture and close down SDL
-    glDeleteTextures( 1, &texture );
-
-    SDL_Quit();
-
-    return 0;
-}
diff --git a/tests/runner.py b/tests/runner.py
index cff43210..f56fd977 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -904,26 +904,26 @@ if 'benchmark' not in str(sys.argv) and 'sanity' not in str(sys.argv) and 'brows
 
           void interface_clock_changed()
           {
-	          UINT8 m_divshift;
-	          INT32 m_divisor;
+            UINT8 m_divshift;
+            INT32 m_divisor;
 
-	          //INT64 attos = m_attoseconds_per_cycle;
-	          INT64 attos = 279365114840;
-	          m_divshift = 0;
-	          while (attos >= (1UL << 31))
-	          {
-		          m_divshift++;
-		          printf("m_divshift is %i, on %Ld >?= %lu\n", m_divshift, attos, 1UL << 31);
-		          attos >>= 1;
-	          }
-	          m_divisor = attos;
+            //INT64 attos = m_attoseconds_per_cycle;
+            INT64 attos = 279365114840;
+            m_divshift = 0;
+            while (attos >= (1UL << 31))
+            {
+              m_divshift++;
+              printf("m_divshift is %i, on %Ld >?= %lu\n", m_divshift, attos, 1UL << 31);
+              attos >>= 1;
+            }
+            m_divisor = attos;
 
-	          printf("m_divisor is %i\n",m_divisor);
+            printf("m_divisor is %i\n",m_divisor);
           }
 
           int main() {
-	          interface_clock_changed();
-	          return 0;
+            interface_clock_changed();
+            return 0;
           }
         '''
         self.do_run(src, '''m_divshift is 1, on 279365114840 >?= 2147483648
@@ -997,8 +997,8 @@ m_divisor is 1091269979
           volatile UINT64 testu64a = 14746250828952703000U;
 
           while ((UINT64)testu32a * (UINT64)bigu32 < testu64a) {
-	          printf("testu64a is %llu\n", testu64a);
-	          testu64a /= 2;
+            printf("testu64a is %llu\n", testu64a);
+            testu64a /= 2;
           }
 
           return 0;
@@ -1409,28 +1409,28 @@ c5,de,15,8a
           quint64 v = strtoull("4433ffeeddccbb00", NULL, 16);
           printf("%lld\n", v);
 
-	        const string string64bitInt = "4433ffeeddccbb00";
-	        stringstream s(string64bitInt);
-	        quint64 int64bitInt = 0;
+          const string string64bitInt = "4433ffeeddccbb00";
+          stringstream s(string64bitInt);
+          quint64 int64bitInt = 0;
           printf("1\n");
-	        s >> hex >> int64bitInt;
+          s >> hex >> int64bitInt;
           printf("2\n");
 
-	        stringstream out;
-	        out << hex << qbswap(int64bitInt);
+          stringstream out;
+          out << hex << qbswap(int64bitInt);
 
-	        cout << out.str() << endl;
-	        cout << hex << int64bitInt << endl;
-	        cout << string64bitInt << endl;
+          cout << out.str() << endl;
+          cout << hex << int64bitInt << endl;
+          cout << string64bitInt << endl;
 
-	        if (out.str() != "bbccddeeff3344")
-	        {
-		        cout << "Failed!" << endl;
-	        }
-	        else
-	        {
-		        cout << "Succeeded!" << endl;
-	        }
+          if (out.str() != "bbccddeeff3344")
+          {
+            cout << "Failed!" << endl;
+          }
+          else
+          {
+            cout << "Succeeded!" << endl;
+          }
 
           return 0;
         }
@@ -3538,36 +3538,36 @@ Exiting setjmp function, level: 0, prev_jmp: -1
       src = open(path_from_root('tests', 'life.c'), 'r').read()
       self.do_run(src, '''--------------------------------
 []                                    []                  [][][]
-                    []  []    []    [][]  []            []  []  
-[]                [][]  [][]              [][][]      []        
+                    []  []    []    [][]  []            []  []
+[]                [][]  [][]              [][][]      []
                   []    []      []      []  [][]    []        []
                   []  [][]    []        []    []  []    [][][][]
-                    [][]      [][]  []    [][][]  []        []  
-                                []  [][]  [][]    [][]  [][][]  
+                    [][]      [][]  []    [][][]  []        []
+                                []  [][]  [][]    [][]  [][][]
                                     [][]          [][][]  []  []
                                     [][]              [][]    []
                                                           [][][]
-                                                            []  
-                                                                
-                                                                
-                                                                
-                                                                
-                                        [][][]                  
-                                      []      [][]      [][]    
-                                      [][]      []  [][]  [][]  
-                                                    [][]  [][]  
-                                                      []        
-                  [][]                                          
+                                                            []
+
+
+
+
+                                        [][][]
+                                      []      [][]      [][]
+                                      [][]      []  [][]  [][]
+                                                    [][]  [][]
+                                                      []
+                  [][]
                   [][]                                        []
 []                                                      [][]  []
                                                   [][][]      []
-                                                []      [][]    
+                                                []      [][]
 []                                                    []      []
-                                                          []    
+                                                          []
 []                                                        []  []
-                                              [][][]            
-                                                                
-                                  []                            
+                                              [][][]
+
+                                  []
                               [][][]                          []
 --------------------------------
 ''', ['2'], force_c=True)
@@ -3955,15 +3955,15 @@ def process(filename):
 
           // see related things in openjpeg
           typedef struct opj_mqc_state {
-	          unsigned int qeval;
-	          int mps;
-	          struct opj_mqc_state *nmps;
-	          struct opj_mqc_state *nlps;
+            unsigned int qeval;
+            int mps;
+            struct opj_mqc_state *nmps;
+            struct opj_mqc_state *nlps;
           } opj_mqc_state_t;
 
           static opj_mqc_state_t mqc_states[2] = {
-	          {0x5600, 0, &mqc_states[2], &mqc_states[3]},
-	          {0x5602, 1, &mqc_states[3], &mqc_states[2]},
+            {0x5600, 0, &mqc_states[2], &mqc_states[3]},
+            {0x5602, 1, &mqc_states[3], &mqc_states[2]},
           };
 
           int main() {
@@ -4534,25 +4534,25 @@ The current type of b is: 9
 
         typedef struct
         {
-	        int (*f)(void *);
-	        void *d;
-	        char s[16];
+          int (*f)(void *);
+          void *d;
+          char s[16];
         } LMEXFunctionStruct;
 
         int f(void *user)
         {
-	        return 0;
+          return 0;
         }
 
         static LMEXFunctionStruct const a[] =
         {
-	        {f, (void *)(int)'a', "aa"}
+          {f, (void *)(int)'a', "aa"}
         };
 
         int main()
         {
           printf("ok\n");
-	        return a[0].f(a[0].d);
+          return a[0].f(a[0].d);
         }
       '''
       self.do_run(src, 'ok\n')
@@ -5937,13 +5937,13 @@ at function.:blag
           printf("|%s|\n", buffy);
 
           int numverts = -1;
-          printf("%d\n", sscanf("	numverts 1499\n", " numverts %d", &numverts)); // white space is the same, even if tab vs space
+          printf("%d\n", sscanf(" numverts 1499\n", " numverts %d", &numverts)); // white space is the same, even if tab vs space
           printf("%d\n", numverts);
 
           int index;
           float u, v;
           short start, count;
-          printf("%d\n", sscanf("	vert 87 ( 0.481565 0.059481 ) 0 1\n", " vert %d ( %f %f ) %hu %hu", &index, &u, &v, &start, &count));
+          printf("%d\n", sscanf(" vert 87 ( 0.481565 0.059481 ) 0 1\n", " vert %d ( %f %f ) %hu %hu", &index, &u, &v, &start, &count));
           printf("%d,%.6f,%.6f,%hu,%hu\n", index, u, v, start, count);
 
           int neg, neg2, neg3 = 0;
@@ -10088,8 +10088,8 @@ f.close()
         #define _TESTA_H_
 
         class TestA {
-	        public:
-		        TestA();
+          public:
+            TestA();
         };
 
         #endif
@@ -10099,8 +10099,8 @@ f.close()
         #define _TESTB_H_
 
         class TestB {
-	        public:
-		        TestB();
+          public:
+            TestB();
         };
 
         #endif
@@ -10110,7 +10110,7 @@ f.close()
         #include <testa.h>
 
         TestA::TestA() {
-	        printf("TestA\n");
+          printf("TestA\n");
         }
       ''')
       open('testb.cpp', 'w').write(r'''
@@ -10120,8 +10120,8 @@ f.close()
         /*
         */
         TestB::TestB() {
-	        printf("TestB\n");
-	        TestA* testa = new TestA();
+          printf("TestB\n");
+          TestA* testa = new TestA();
         }
       ''')
       open('main.cpp', 'w').write(r'''
@@ -10132,9 +10132,9 @@ f.close()
         /*
         */
         int main(int argc, char** argv) {
-	        printf("Main\n");
-	        TestA* testa = new TestA();
-	        TestB* testb = new TestB();
+          printf("Main\n");
+          TestA* testa = new TestA();
+          TestB* testb = new TestB();
         }
       ''')
 
@@ -10759,7 +10759,7 @@ f.close()
       output = Popen([os.path.join(self.get_dir(), 'files.o.run')], stdin=open(os.path.join(self.get_dir(), 'stdin')), stdout=PIPE, stderr=PIPE).communicate()
       self.assertContained('''size: 37
 data: 119,97,107,97,32,119,97,107,97,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35
-loop: 119 97 107 97 32 119 97 107 97 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 
+loop: 119 97 107 97 32 119 97 107 97 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
 input:inter-active
 texto
 $
@@ -12108,14 +12108,6 @@ elif 'browser' in str(sys.argv):
       shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'screenshot.png'))
       self.btest('gl_ps_packed.c', reference='gl_ps.png', args=['--preload-file', 'screenshot.png'])
 
-    def test_gl_ps_workaround(self):
-      shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'screenshot.png'))
-      self.btest('gl_ps_workaround.c', reference='gl_ps.png', args=['--preload-file', 'screenshot.png'])
-
-    def test_gl_ps_workaround2(self):
-      shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'screenshot.png'))
-      self.btest('gl_ps_workaround2.c', reference='gl_ps.png', args=['--preload-file', 'screenshot.png'])
-
     def test_gl_ps_strides(self):
       shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'screenshot.png'))
       self.btest('gl_ps_strides.c', reference='gl_ps_strides.png', args=['--preload-file', 'screenshot.png'])
@@ -13559,7 +13551,7 @@ if __name__ == '__main__':
         which = map(lambda mode: mode+'.'+test, test_modes)
       else:
         which = [which]
-      
+
       print >> sys.stderr, ','.join(which)
       for test in which:
         print >> sys.stderr, 'will skip "%s"' % test