Add missing VS project dependencies to fix buildbot build; fix surface suite; minor update to rwops suite
authorAndreas Schiffler <aschiffler@ferzkopp.net>
Sun, 30 Dec 2012 10:58:18 -0800
changeset 6779c3b579c78059
parent 6778 d57d273d74f9
child 6780 111b37940b35
Add missing VS project dependencies to fix buildbot build; fix surface suite; minor update to rwops suite
VisualC/SDL_VS2010.sln
VisualC/SDL_VS2012.sln
VisualC/tests/testautomation/testautomation_vs2010.vcxproj
VisualC/tests/testautomation/testautomation_vs2012.vcxproj
test/testautomation_rwops.c
test/testautomation_surface.c
     1.1 --- a/VisualC/SDL_VS2010.sln	Sun Dec 30 09:58:03 2012 -0800
     1.2 +++ b/VisualC/SDL_VS2010.sln	Sun Dec 30 10:58:18 2012 -0800
     1.3 @@ -67,6 +67,11 @@
     1.4  	EndProjectSection
     1.5  EndProject
     1.6  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_vs2010.vcxproj", "{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}"
     1.7 +	ProjectSection(ProjectDependencies) = postProject
     1.8 +		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
     1.9 +		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
    1.10 +		{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
    1.11 +	EndProjectSection
    1.12  EndProject
    1.13  Global
    1.14  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
     2.1 --- a/VisualC/SDL_VS2012.sln	Sun Dec 30 09:58:03 2012 -0800
     2.2 +++ b/VisualC/SDL_VS2012.sln	Sun Dec 30 10:58:18 2012 -0800
     2.3 @@ -67,6 +67,11 @@
     2.4  	EndProjectSection
     2.5  EndProject
     2.6  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_vs2012.vcxproj", "{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}"
     2.7 +	ProjectSection(ProjectDependencies) = postProject
     2.8 +		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
     2.9 +		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
    2.10 +		{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
    2.11 +	EndProjectSection
    2.12  EndProject
    2.13  Global
    2.14  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
     3.1 --- a/VisualC/tests/testautomation/testautomation_vs2010.vcxproj	Sun Dec 30 09:58:03 2012 -0800
     3.2 +++ b/VisualC/tests/testautomation/testautomation_vs2010.vcxproj	Sun Dec 30 10:58:18 2012 -0800
     3.3 @@ -92,6 +92,12 @@
     3.4        <SubSystem>Windows</SubSystem>
     3.5        <TargetMachine>MachineX86</TargetMachine>
     3.6      </Link>
     3.7 +    <PostBuildEvent>
     3.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
     3.9 +    </PostBuildEvent>
    3.10 +    <PostBuildEvent>
    3.11 +      <Message>Copy SDL</Message>
    3.12 +    </PostBuildEvent>
    3.13    </ItemDefinitionGroup>
    3.14    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    3.15      <ClCompile>
    3.16 @@ -136,6 +142,12 @@
    3.17        <EnableCOMDATFolding>true</EnableCOMDATFolding>
    3.18        <TargetMachine>MachineX86</TargetMachine>
    3.19      </Link>
    3.20 +    <PostBuildEvent>
    3.21 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    3.22 +    </PostBuildEvent>
    3.23 +    <PostBuildEvent>
    3.24 +      <Message>Copy SDL</Message>
    3.25 +    </PostBuildEvent>
    3.26    </ItemDefinitionGroup>
    3.27    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    3.28      <ClCompile>
    3.29 @@ -149,6 +161,12 @@
    3.30        </PrecompiledHeader>
    3.31        <WarningLevel>Level3</WarningLevel>
    3.32        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    3.33 +    <PostBuildEvent>
    3.34 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    3.35 +    </PostBuildEvent>
    3.36 +    <PostBuildEvent>
    3.37 +      <Message>Copy SDL</Message>
    3.38 +    </PostBuildEvent>
    3.39      </ClCompile>
    3.40      <Link>
    3.41        <GenerateDebugInformation>true</GenerateDebugInformation>
     4.1 --- a/VisualC/tests/testautomation/testautomation_vs2012.vcxproj	Sun Dec 30 09:58:03 2012 -0800
     4.2 +++ b/VisualC/tests/testautomation/testautomation_vs2012.vcxproj	Sun Dec 30 10:58:18 2012 -0800
     4.3 @@ -96,6 +96,12 @@
     4.4        <SubSystem>Windows</SubSystem>
     4.5        <TargetMachine>MachineX86</TargetMachine>
     4.6      </Link>
     4.7 +    <PostBuildEvent>
     4.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
     4.9 +    </PostBuildEvent>
    4.10 +    <PostBuildEvent>
    4.11 +      <Message>Copy SDL</Message>
    4.12 +    </PostBuildEvent>
    4.13    </ItemDefinitionGroup>
    4.14    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    4.15      <ClCompile>
    4.16 @@ -140,6 +146,12 @@
    4.17        <EnableCOMDATFolding>true</EnableCOMDATFolding>
    4.18        <TargetMachine>MachineX86</TargetMachine>
    4.19      </Link>
    4.20 +    <PostBuildEvent>
    4.21 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    4.22 +    </PostBuildEvent>
    4.23 +    <PostBuildEvent>
    4.24 +      <Message>Copy SDL</Message>
    4.25 +    </PostBuildEvent>
    4.26    </ItemDefinitionGroup>
    4.27    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    4.28      <ClCompile>
    4.29 @@ -160,6 +172,12 @@
    4.30        <OptimizeReferences>true</OptimizeReferences>
    4.31        <EnableCOMDATFolding>true</EnableCOMDATFolding>
    4.32      </Link>
    4.33 +    <PostBuildEvent>
    4.34 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    4.35 +    </PostBuildEvent>
    4.36 +    <PostBuildEvent>
    4.37 +      <Message>Copy SDL</Message>
    4.38 +    </PostBuildEvent>
    4.39    </ItemDefinitionGroup>
    4.40    <ItemGroup>
    4.41      <ClCompile Include="..\..\..\test\testautomation.c" />
     5.1 --- a/test/testautomation_rwops.c	Sun Dec 30 09:58:03 2012 -0800
     5.2 +++ b/test/testautomation_rwops.c	Sun Dec 30 10:58:18 2012 -0800
     5.3 @@ -76,7 +76,7 @@
     5.4  _testGenericRWopsValidations(SDL_RWops *rw, int write)
     5.5  {
     5.6     char buf[sizeof(RWopsHelloWorldTestString)];
     5.7 -   int i;
     5.8 +   Sint64 i;
     5.9     int seekPos = SDLTest_RandomIntegerInRange(4, 8);
    5.10  
    5.11     /* Clear buffer */
    5.12 @@ -85,33 +85,33 @@
    5.13     /* Set to start. */
    5.14     i = SDL_RWseek(rw, 0, RW_SEEK_SET );
    5.15     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.16 -   SDLTest_AssertCheck(i == 0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %i", i);
    5.17 +   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %i", i);
    5.18  
    5.19     /* Test write. */
    5.20     i = SDL_RWwrite(rw, RWopsHelloWorldTestString, sizeof(RWopsHelloWorldTestString)-1, 1);
    5.21     SDLTest_AssertPass("Call to SDL_RWwrite succeeded");
    5.22     if (write) {
    5.23 -		SDLTest_AssertCheck(i == 1, "Verify result of writing one byte with SDL_RWwrite, expected 1, got %i", i);
    5.24 +		SDLTest_AssertCheck(i == (Sint64)1, "Verify result of writing one byte with SDL_RWwrite, expected 1, got %i", i);
    5.25     }
    5.26     else {
    5.27 -		SDLTest_AssertCheck(i <= 0, "Verify result of writing with SDL_RWwrite, expected <=0, got %i", i);
    5.28 +		SDLTest_AssertCheck(i != (Sint64)1, "Verify result of writing with SDL_RWwrite, expected !=1, got %i", i);
    5.29     }
    5.30  
    5.31     /* Test seek to random position */
    5.32     i = SDL_RWseek( rw, seekPos, RW_SEEK_SET );
    5.33     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.34 -   SDLTest_AssertCheck(i == seekPos, "Verify seek to %i with SDL_RWseek (RW_SEEK_SET), expected %i, got %i", seekPos, seekPos, i);
    5.35 +   SDLTest_AssertCheck(i == (Sint64)seekPos, "Verify seek to %i with SDL_RWseek (RW_SEEK_SET), expected %i, got %i", seekPos, seekPos, i);
    5.36  
    5.37     /* Test seek back to start */
    5.38     i = SDL_RWseek(rw, 0, RW_SEEK_SET );
    5.39     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.40 -   SDLTest_AssertCheck(i == 0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %i", i);
    5.41 +   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %i", i);
    5.42  
    5.43     /* Test read */
    5.44     i = SDL_RWread( rw, buf, 1, sizeof(RWopsHelloWorldTestString)-1 );
    5.45     SDLTest_AssertPass("Call to SDL_RWread succeeded");
    5.46     SDLTest_AssertCheck(
    5.47 -	   i == (sizeof(RWopsHelloWorldTestString)-1), 
    5.48 +	   i == (Sint64)(sizeof(RWopsHelloWorldTestString)-1), 
    5.49  	   "Verify result from SDL_RWread, expected %i, got %i",
    5.50  	   sizeof(RWopsHelloWorldTestString)-1,
    5.51  	   i);
    5.52 @@ -123,7 +123,7 @@
    5.53     i = SDL_RWseek( rw, -4, RW_SEEK_CUR );
    5.54     SDLTest_AssertPass("Call to SDL_RWseek(...,-4,RW_SEEK_CUR) succeeded");
    5.55     SDLTest_AssertCheck(
    5.56 -	   i == (sizeof(RWopsHelloWorldTestString)-5), 
    5.57 +	   i == (Sint64)(sizeof(RWopsHelloWorldTestString)-5), 
    5.58  	   "Verify seek to -4 with SDL_RWseek (RW_SEEK_CUR), expected %i, got %i",
    5.59  	   sizeof(RWopsHelloWorldTestString)-5,
    5.60  	   i);
    5.61 @@ -131,7 +131,7 @@
    5.62     i = SDL_RWseek( rw, -1, RW_SEEK_END );
    5.63     SDLTest_AssertPass("Call to SDL_RWseek(...,-1,RW_SEEK_END) succeeded");
    5.64     SDLTest_AssertCheck(
    5.65 -	   i == (sizeof(RWopsHelloWorldTestString)-2), 
    5.66 +	   i == (Sint64)(sizeof(RWopsHelloWorldTestString)-2), 
    5.67  	   "Verify seek to -1 with SDL_RWseek (RW_SEEK_END), expected %i, got %i",
    5.68  	   sizeof(RWopsHelloWorldTestString)-2,
    5.69  	   i);
    5.70 @@ -326,7 +326,7 @@
    5.71     if (fp == NULL) return TEST_ABORTED;
    5.72  
    5.73     /* Open */
    5.74 -   rw = SDL_RWFromFP( fp, 1 );
    5.75 +   rw = SDL_RWFromFP( fp, SDL_TRUE );
    5.76     SDLTest_AssertPass("Call to SDL_RWFromFP() succeeded");
    5.77     SDLTest_AssertCheck(rw != NULL, "Verify opening file with SDL_RWFromFP in read mode does not return NULL");
    5.78  
    5.79 @@ -369,7 +369,7 @@
    5.80     if (fp == NULL) return TEST_ABORTED;
    5.81  
    5.82     /* Open */
    5.83 -   rw = SDL_RWFromFP( fp, 1 );
    5.84 +   rw = SDL_RWFromFP( fp, SDL_TRUE );
    5.85     SDLTest_AssertPass("Call to SDL_RWFromFP() succeeded");
    5.86     SDLTest_AssertCheck(rw != NULL, "Verify opening file with SDL_RWFromFP in write mode does not return NULL");
    5.87  
     6.1 --- a/test/testautomation_surface.c	Sun Dec 30 09:58:03 2012 -0800
     6.2 +++ b/test/testautomation_surface.c	Sun Dec 30 10:58:18 2012 -0800
     6.3 @@ -11,34 +11,53 @@
     6.4  
     6.5  /* ================= Test Case Implementation ================== */
     6.6  
     6.7 -
     6.8  /* Shared test surface */
     6.9  
    6.10 -static SDL_Surface *testsurface = NULL;
    6.11 +static SDL_Surface *referenceSurface = NULL;
    6.12 +static SDL_Surface *testSurface = NULL;
    6.13 +
    6.14 +/* Helper functions for the test cases */
    6.15 +
    6.16 +#define TEST_SURFACE_WIDTH testSurface->w
    6.17 +#define TEST_SURFACE_HEIGHT testSurface->h
    6.18  
    6.19  /* Fixture */
    6.20  
    6.21 +/* Create a 32-bit writable surface for screen tests */
    6.22  void
    6.23  _surfaceSetUp(void *arg)
    6.24  {
    6.25 -   testsurface = SDLTest_ImageBlit();
    6.26 -   SDLTest_AssertCheck(testsurface != NULL, "Check that testsurface is not NULL");
    6.27 +    Uint32 rmask, gmask, bmask, amask;
    6.28 +#if SDL_BYTEORDER == SDL_BIG_ENDIAN
    6.29 +    rmask = 0xff000000;
    6.30 +    gmask = 0x00ff0000;
    6.31 +    bmask = 0x0000ff00;
    6.32 +    amask = 0x000000ff;
    6.33 +#else
    6.34 +    rmask = 0x000000ff;
    6.35 +    gmask = 0x0000ff00;
    6.36 +    bmask = 0x00ff0000;
    6.37 +    amask = 0xff000000;
    6.38 +#endif
    6.39 +
    6.40 +	referenceSurface = SDLTest_ImageBlit(); /* For size info */
    6.41 +	testSurface = SDL_CreateRGBSurface(SDL_SWSURFACE, referenceSurface->w, referenceSurface->h, 32, rmask, gmask, bmask, amask);
    6.42 +    SDLTest_AssertCheck(testSurface != NULL, "Check that testSurface is not NULL");
    6.43  }
    6.44  
    6.45  void
    6.46  _surfaceTearDown(void *arg)
    6.47  {
    6.48 -	if (testsurface != NULL) {
    6.49 -		SDL_FreeSurface(testsurface);
    6.50 -		testsurface = NULL;
    6.51 +	if (referenceSurface != NULL) {
    6.52 +		SDL_FreeSurface(referenceSurface);
    6.53 +		referenceSurface = NULL;
    6.54 +	}
    6.55 +	if (testSurface != NULL) {
    6.56 +		SDL_FreeSurface(testSurface);
    6.57 +		testSurface = NULL;
    6.58  	}
    6.59  }
    6.60  
    6.61 -/* Helper functions for the test cases */
    6.62 -
    6.63 -#define TEST_SURFACE_WIDTH testsurface->w
    6.64 -#define TEST_SURFACE_HEIGHT testsurface->h
    6.65 -
    6.66  /**
    6.67   * Helper that clears the test surface
    6.68   */
    6.69 @@ -48,9 +67,9 @@
    6.70  	Uint32 color;
    6.71  	
    6.72  	/* Clear surface. */
    6.73 -	color = SDL_MapRGB( testsurface->format, 0, 0, 0);
    6.74 +	color = SDL_MapRGB( testSurface->format, 0, 0, 0);
    6.75  	SDLTest_AssertPass("Call to SDL_MapRGB()");
    6.76 -	ret = SDL_FillRect( testsurface, NULL, color);
    6.77 +	ret = SDL_FillRect( testSurface, NULL, color);
    6.78  	SDLTest_AssertPass("Call to SDL_FillRect()");
    6.79  	SDLTest_AssertCheck(ret == 0, "Verify result from SDL_FillRect, expected: 0, got: %i", ret);
    6.80  }
    6.81 @@ -64,16 +83,16 @@
    6.82  	int i, j, ni, nj;
    6.83  	SDL_Surface *face;
    6.84  	SDL_Rect rect;
    6.85 -	Uint32 color;
    6.86  	int nmode;
    6.87 +	SDL_BlendMode bmode;
    6.88  	int checkFailCount1;
    6.89  	int checkFailCount2;
    6.90  	int checkFailCount3;
    6.91  	int checkFailCount4;
    6.92  
    6.93  	/* Check test surface */
    6.94 -	SDLTest_AssertCheck(testsurface != NULL, "Verify testsurface is not NULL");
    6.95 -	if (testsurface == NULL) return;
    6.96 +	SDLTest_AssertCheck(testSurface != NULL, "Verify testSurface is not NULL");
    6.97 +	if (testSurface == NULL) return;
    6.98  	
    6.99  	/* Create sample surface */
   6.100  	face = SDLTest_ImageFace();
   6.101 @@ -88,8 +107,8 @@
   6.102  	rect.h = face->h;
   6.103  	
   6.104  	/* Steps to take */
   6.105 -	ni = testsurface->w - face->w;
   6.106 -	nj = testsurface->h - face->h;
   6.107 +	ni = testSurface->w - face->w;
   6.108 +	nj = testSurface->h - face->h;
   6.109  
   6.110  	/* Optionally set blend mode. */
   6.111  	if (mode >= 0) {
   6.112 @@ -118,18 +137,18 @@
   6.113  		else if (mode == -4) {
   6.114  			/* Crazy blending mode magic. */
   6.115  			nmode = (i/4*j/4) % 4;
   6.116 -			if (nmode==0) nmode = SDL_BLENDMODE_NONE;
   6.117 -			else if (nmode==1) nmode = SDL_BLENDMODE_BLEND;
   6.118 -			else if (nmode==2) nmode = SDL_BLENDMODE_ADD;
   6.119 -			else if (nmode==3) nmode = SDL_BLENDMODE_MOD;
   6.120 -			ret = SDL_SetSurfaceBlendMode( face, nmode );		
   6.121 +			if (nmode==0) bmode = SDL_BLENDMODE_NONE;
   6.122 +			else if (nmode==1) bmode = SDL_BLENDMODE_BLEND;
   6.123 +			else if (nmode==2) bmode = SDL_BLENDMODE_ADD;
   6.124 +			else if (nmode==3) bmode = SDL_BLENDMODE_MOD;
   6.125 +			ret = SDL_SetSurfaceBlendMode( face, bmode );		
   6.126  			if (ret != 0) checkFailCount4++;
   6.127  		}
   6.128  
   6.129  		 /* Blitting. */
   6.130  		 rect.x = i;
   6.131  		 rect.y = j;
   6.132 -		 ret = SDL_BlitSurface( face, NULL, testsurface, &rect );
   6.133 +		 ret = SDL_BlitSurface( face, NULL, testSurface, &rect );
   6.134  		 if (ret != 0) checkFailCount1++;
   6.135  	  }
   6.136  	}
   6.137 @@ -172,7 +191,7 @@
   6.138      /* Create sample surface */
   6.139      face = SDLTest_ImageFace();
   6.140      SDLTest_AssertCheck(face != NULL, "Verify face surface is not NULL");
   6.141 -    if (face == NULL) return;
   6.142 +    if (face == NULL) return TEST_ABORTED;
   6.143  
   6.144      /* Delete test file; ignore errors */
   6.145      unlink(sampleFilename);
   6.146 @@ -231,7 +250,7 @@
   6.147  	}
   6.148  
   6.149  	/* Convert to 32 bit to compare. */
   6.150 -	rface = SDL_ConvertSurface( face, testsurface->format, 0 );
   6.151 +	rface = SDL_ConvertSurface( face, testSurface->format, 0 );
   6.152  	SDLTest_AssertPass("Call to SDL_ConvertSurface()");
   6.153  	SDLTest_AssertCheck(rface != NULL, "Verify result from SDL_ConvertSurface is not NULL");
   6.154  
   6.155 @@ -279,7 +298,7 @@
   6.156     
   6.157     /* Verify result by comparing surfaces */
   6.158     referenceSurface = SDLTest_ImageBlit();
   6.159 -   ret = SDLTest_CompareSurfaces( testsurface, referenceSurface, 0 );
   6.160 +   ret = SDLTest_CompareSurfaces( testSurface, referenceSurface, 0 );
   6.161     SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
   6.162     
   6.163     /* Clean up. */
   6.164 @@ -304,7 +323,7 @@
   6.165     
   6.166     /* Verify result by comparing surfaces */
   6.167     referenceSurface = SDLTest_ImageBlitColor();
   6.168 -   ret = SDLTest_CompareSurfaces( testsurface, referenceSurface, 0 );
   6.169 +   ret = SDLTest_CompareSurfaces( testSurface, referenceSurface, 0 );
   6.170     SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
   6.171     
   6.172     /* Clean up. */
   6.173 @@ -329,7 +348,7 @@
   6.174     
   6.175     /* Verify result by comparing surfaces */
   6.176     referenceSurface = SDLTest_ImageBlitAlpha();
   6.177 -   ret = SDLTest_CompareSurfaces( testsurface, referenceSurface, 0 );
   6.178 +   ret = SDLTest_CompareSurfaces( testSurface, referenceSurface, 0 );
   6.179     SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
   6.180     
   6.181     /* Clean up. */
   6.182 @@ -355,7 +374,7 @@
   6.183     
   6.184     /* Verify result by comparing surfaces */
   6.185     referenceSurface = SDLTest_ImageBlitBlendNone();
   6.186 -   ret = SDLTest_CompareSurfaces( testsurface, referenceSurface, 0 );
   6.187 +   ret = SDLTest_CompareSurfaces( testSurface, referenceSurface, 0 );
   6.188     SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
   6.189     
   6.190     /* Clean up. */
   6.191 @@ -380,7 +399,7 @@
   6.192     
   6.193     /* Verify result by comparing surfaces */
   6.194     referenceSurface = SDLTest_ImageBlitBlend();
   6.195 -   ret = SDLTest_CompareSurfaces( testsurface, referenceSurface, 0 );
   6.196 +   ret = SDLTest_CompareSurfaces( testSurface, referenceSurface, 0 );
   6.197     SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
   6.198     
   6.199     /* Clean up. */
   6.200 @@ -405,7 +424,7 @@
   6.201     
   6.202     /* Verify result by comparing surfaces */
   6.203     referenceSurface = SDLTest_ImageBlitBlendAdd();
   6.204 -   ret = SDLTest_CompareSurfaces( testsurface, referenceSurface, 0 );
   6.205 +   ret = SDLTest_CompareSurfaces( testSurface, referenceSurface, 0 );
   6.206     SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
   6.207     
   6.208     /* Clean up. */
   6.209 @@ -430,7 +449,7 @@
   6.210     
   6.211     /* Verify result by comparing surfaces */
   6.212     referenceSurface = SDLTest_ImageBlitBlendMod();
   6.213 -   ret = SDLTest_CompareSurfaces( testsurface, referenceSurface, 0 );
   6.214 +   ret = SDLTest_CompareSurfaces( testSurface, referenceSurface, 0 );
   6.215     SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
   6.216     
   6.217     /* Clean up. */
   6.218 @@ -455,7 +474,7 @@
   6.219     
   6.220     /* Verify result by comparing surfaces */
   6.221     referenceSurface = SDLTest_ImageBlitBlendAll();
   6.222 -   ret = SDLTest_CompareSurfaces( testsurface, referenceSurface, 0 );
   6.223 +   ret = SDLTest_CompareSurfaces( testSurface, referenceSurface, 0 );
   6.224     SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
   6.225     
   6.226     /* Clean up. */