Ported platform tests, added AssertPass and AssertFail

libsdl-org · Jun 18, 2011 · e0d9ee8 · e0d9ee8
1 parent b198b8f
commit e0d9ee8
Show file tree

Hide file tree

Showing 6 changed files with 747 additions and 5 deletions.
diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
 
-SUBDIRS = testdummy testrect
+SUBDIRS = testdummy testrect testplatform
 
 bin_PROGRAMS = runner
 runner_SOURCES = runner.c SDL_test.c
@@ -14,8 +14,9 @@ install-tests:
 	-cp -f testdummy/.libs/*.so tests/ 2> /dev/null
 	-cp -f testrect/.libs/*.dylib tests/ 2> /dev/null
 	-cp -f testrect/.libs/*.so tests/ 2> /dev/null
+	-cp -f testplatform/.libs/*.dylib tests/ 2> /dev/null
+	-cp -f testplatform/.libs/*.so tests/ 2> /dev/null
 
 distclean-local:
 	-rm -Rf tests/ docs/
 
-
diff --git a/test/test-automation/SDL_test.c b/test/test-automation/SDL_test.c
@@ -66,10 +66,11 @@ AssertEquals(Uint32 expected, Uint32 actual, char* message, ...)
       va_start( args, message );
       SDL_vsnprintf( buf, sizeof(buf), message, args );
       va_end( args );
-      printf("Assert Equals failed: expected %d, got %d; %s\n", expected, actual, buf);
+      printf("AssertEquals failed: expected %d, got %d; %s\n", expected, actual, buf);
       _testReturnValue = 1;
       _testAssertsFailed++;
    } else {
+      printf("AssertEquals passed\n");
       _testAssertsPassed++;
    }
 }
@@ -85,12 +86,43 @@ AssertTrue(int condition, char *message, ...)
       SDL_vsnprintf( buf, sizeof(buf), message, args );
       va_end( args );
 
-      printf("Assert IsTrue failed: %s\n", buf);
+      printf("AssertTrue failed: %s\n", buf);
       _testReturnValue = 1;
       _testAssertsFailed++;
    } else {
+     printf("AssertTrue passed\n");
       _testAssertsPassed++;
    }
 }
 
+void
+AssertPass(char *message, ...)
+{
+   va_list args;
+   char buf[256];
+
+   va_start( args, message );
+   SDL_vsnprintf( buf, sizeof(buf), message, args );
+   va_end( args );
+
+   printf("AssertPass: %s\n", buf);
+
+   _testAssertsPassed++;
+}
+
+void
+AssertFail(char *message, ...)
+{
+   va_list args;
+   char buf[256];
+
+   va_start( args, message );
+   SDL_vsnprintf( buf, sizeof(buf), message, args );
+   va_end( args );
+
+   printf("AssertFail: %s\n", buf);
+
+   _testAssertsFailed++;
+}
+
 #endif
diff --git a/test/test-automation/configure.ac b/test/test-automation/configure.ac
@@ -34,7 +34,8 @@ AC_FUNC_FORK
 
 AC_CONFIG_FILES([Makefile
 				 testdummy/Makefile 
-				 testrect/Makefile])
+				 testrect/Makefile
+				 testplatform/Makefile])
 AC_OUTPUT
 
 echo ""

diff --git a/test/test-automation/testplatform/Makefile.am b/test/test-automation/testplatform/Makefile.am
@@ -0,0 +1,9 @@
+lib_LTLIBRARIES = libtestplatform.la
+libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c
+libtestplatform_la_CLAGS = -fPIC -g
+libtestplatform_la_LDFLAGS = `sdl-config --libs`
+
+distclean-local:
+	-rm *.dylib
+	-rm *.so
+