Simplifying

libsdl-org · May 24, 2011 · 4c64f19 · 4c64f19
1 parent 7cba0f8
commit 4c64f19
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 59 deletions.
diff --git a/test/test-automation/.hgignore b/test/test-automation/.hgignore
diff --git a/test/test-automation/asserts.c b/test/test-automation/asserts.c
@@ -26,10 +26,13 @@
 #include <stdlib.h>
 
 void
-assertEquals(Uint32 expected, Uint32 actual)
+assertEquals(char *message, Uint32 expected, Uint32 actual)
 {
 	if(expected != actual) {
-		exit(1);
+		printf("===============================\n");
+		printf("Assert failed: %s\n", message);
+		printf("Expected %d, got %d\n", expected, actual);
+		printf("===============================\n");
 	}
 }
 

diff --git a/test/test-automation/asserts.h b/test/test-automation/asserts.h
@@ -23,6 +23,6 @@
 
 #include <SDL/SDL.h>
 
-void assertEquals(Uint32 expected, Uint32 actual);
+void assertEquals(char *message, Uint32 expected, Uint32 actual);
 
 #endif
diff --git a/test/test-automation/test.c b/test/test-automation/test.c
@@ -37,7 +37,7 @@ void hello(void *arg){
 	const char *revision = SDL_GetRevision();
 
 	printf("Revision is %s\n", revision);
-	assertEquals(3, 5);
+	assertEquals("will fail", 3, 5);
 }
 
 void hello2(void *arg) {
@@ -48,7 +48,7 @@ void hello2(void *arg) {
 void hello3(void *arg) {
 	printf("hello\n");
 
-	assertEquals(3, 3);
+	assertEquals("passes", 3, 3);
 }
 
 #endif
diff --git a/test/test-automation/test.h b/test/test-automation/test.h