Moved tests/SDL_test.{c,h}
authorMarkus Kauppila <markus.kauppila@gmail.com>
Mon, 30 May 2011 21:57:04 +0300
changeset 5674 1ee88babe722
parent 5673 07b920bcff70
child 5675 8513baf78c95
Moved tests/SDL_test.{c,h}
test/test-automation/Makefile.am
test/test-automation/SDL_test.c
test/test-automation/SDL_test.h
test/test-automation/runner.c
test/test-automation/tests/Makefile.am
test/test-automation/tests/SDL_test.c
test/test-automation/tests/SDL_test.h
test/test-automation/tests/test.c
--- a/test/test-automation/Makefile.am	Mon May 30 18:58:20 2011 +0300
+++ b/test/test-automation/Makefile.am	Mon May 30 21:57:04 2011 +0300
@@ -3,7 +3,7 @@
 SUBDIRS = tests
 
 bin_PROGRAMS = runner
-runner_SOURCES = runner.c tests/SDL_test.c
+runner_SOURCES = runner.c SDL_test.c
 runner_CLAGS = -W -Wall -Wextra -g `sdl-config --cflags` -DSDL_NO_COMPAT
 runner_LDFLAGS = `sdl-config --libs`
 
@@ -12,4 +12,7 @@
 	-cp -f tests/.libs/*.dylib tests/ 2> /dev/null
 	-cp -f tests/.libs/*.so tests/ 2> /dev/null
 
+distclean-local:
+	-rm -Rf docs/
 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/test-automation/SDL_test.c	Mon May 30 21:57:04 2011 +0300
@@ -0,0 +1,54 @@
+/*
+  Copyright (C) 2011 Markus Kauppila <markus.kauppila@gmail.com>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_TEST_C
+#define _SDL_TEST_C
+
+#include "SDL_test.h"
+
+/*! \brief return value of test case. Non-zero value means that the test failed */
+static int _testReturnValue;
+
+void
+TestCaseInit()
+{
+	_testReturnValue = 0;
+}
+
+int
+TestCaseQuit()
+{
+	return _testReturnValue;
+}
+
+void
+AssertEquals(char *message, Uint32 expected, Uint32 actual)
+{
+	if(expected != actual) {
+		printf("===============================\n");
+		printf("Assert failed: %s\n", message);
+		printf("Expected %d, got %d\n", expected, actual);
+		printf("===============================\n");
+		_testReturnValue = 1;
+	}
+}
+
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/test-automation/SDL_test.h	Mon May 30 21:57:04 2011 +0300
@@ -0,0 +1,58 @@
+/*
+  Copyright (C) 2011 Markus Kauppila <markus.kauppila@gmail.com>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_TEST_H
+#define _SDL_TEST_H
+
+#include <SDL/SDL.h>
+
+// \todo Should these be consts?
+#define TEST_ENABLED  1
+#define TEST_DISABLED 0
+
+
+/*!
+ * Holds information about a test case
+ */
+typedef struct TestCaseReference {
+	char *name;         /*!< "Func2Stress" */
+	char *description;  /*!< "This test beats the crap out of func2()" */
+	int enabled;       /*!< Set to TEST_ENABLED or TEST_DISABLED */
+	long requirements;  /*!< Set to TEST_REQUIRES_OPENGL, TEST_REQUIRES_AUDIO, ... */
+} TestCaseReference;
+
+/*! \fn TestCaseInit
+ *  Initialized the test case. Must be called at
+ *  the beginning of every test case, before doing
+ *  anything else.
+ */
+void TestCaseInit();
+
+/*! \fn TestCaseQuit
+ *  Deinitializes and exits the test case
+ *
+ * \return 0 if test succeeded, otherwise 1
+ */
+int TestCaseQuit();
+
+
+void AssertEquals(char *message, Uint32 expected, Uint32 actual);
+
+#endif
--- a/test/test-automation/runner.c	Mon May 30 18:58:20 2011 +0300
+++ b/test/test-automation/runner.c	Mon May 30 21:57:04 2011 +0300
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "tests/SDL_test.h"
+#include "SDL_test.h"
 
 //!< Function pointer to a test case function
 typedef int (*TestCase)(void *arg);
--- a/test/test-automation/tests/Makefile.am	Mon May 30 18:58:20 2011 +0300
+++ b/test/test-automation/tests/Makefile.am	Mon May 30 21:57:04 2011 +0300
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libtest.la
-libtest_la_SOURCES = test.c SDL_test.c
+libtest_la_SOURCES = test.c ../SDL_test.c
 libtest_la_CLAGS = -fPIC -g
 libtest_la_LDFLAGS = `sdl-config --libs`
 
--- a/test/test-automation/tests/SDL_test.c	Mon May 30 18:58:20 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-  Copyright (C) 2011 Markus Kauppila <markus.kauppila@gmail.com>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_TEST_C
-#define _SDL_TEST_C
-
-#include "SDL_test.h"
-
-/*! \brief return value of test case. Non-zero value means that the test failed */
-static int _testReturnValue;
-
-void
-TestCaseInit()
-{
-	_testReturnValue = 0;
-}
-
-int
-TestCaseQuit()
-{
-	return _testReturnValue;
-}
-
-void
-AssertEquals(char *message, Uint32 expected, Uint32 actual)
-{
-	if(expected != actual) {
-		printf("===============================\n");
-		printf("Assert failed: %s\n", message);
-		printf("Expected %d, got %d\n", expected, actual);
-		printf("===============================\n");
-		_testReturnValue = 1;
-	}
-}
-
-
-#endif
--- a/test/test-automation/tests/SDL_test.h	Mon May 30 18:58:20 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-  Copyright (C) 2011 Markus Kauppila <markus.kauppila@gmail.com>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_TEST_H
-#define _SDL_TEST_H
-
-#include <SDL/SDL.h>
-
-// \todo Should these be consts?
-#define TEST_ENABLED  1
-#define TEST_DISABLED 0
-
-
-/*!
- * Holds information about a test case
- */
-typedef struct TestCaseReference {
-	char *name;         /*!< "Func2Stress" */
-	char *description;  /*!< "This test beats the crap out of func2()" */
-	int enabled;       /*!< Set to TEST_ENABLED or TEST_DISABLED */
-	long requirements;  /*!< Set to TEST_REQUIRES_OPENGL, TEST_REQUIRES_AUDIO, ... */
-} TestCaseReference;
-
-/*! \fn TestCaseInit
- *  Initialized the test case. Must be called at
- *  the beginning of every test case, before doing
- *  anything else.
- */
-void TestCaseInit();
-
-/*! \fn TestCaseQuit
- *  Deinitializes and exits the test case
- *
- * \return 0 if test succeeded, otherwise 1
- */
-int TestCaseQuit();
-
-
-void AssertEquals(char *message, Uint32 expected, Uint32 actual);
-
-#endif
--- a/test/test-automation/tests/test.c	Mon May 30 18:58:20 2011 +0300
+++ b/test/test-automation/tests/test.c	Mon May 30 21:57:04 2011 +0300
@@ -25,7 +25,7 @@
 
 #include <SDL/SDL.h>
 
-#include "SDL_test.h"
+#include "../SDL_test.h"
 
 /* Test cases */
 static const TestCaseReference test1 =