From d6d8dec05e1ccf887962cb190bb2bc3e478a19e7 Mon Sep 17 00:00:00 2001 From: Markus Kauppila Date: Thu, 26 May 2011 18:38:56 +0300 Subject: [PATCH] Refactoring the massive main() to smaller functions. --HG-- rename : test/test-automation/tests/asserts.c => test/test-automation/tests/SDL_test.c rename : test/test-automation/tests/asserts.h => test/test-automation/tests/SDL_test.h --- test/test-automation/Makefile.am | 2 +- test/test-automation/configure.ac | 3 + test/test-automation/runner.c | 153 ++++++++++-------- test/test-automation/tests/Makefile.am | 4 +- .../tests/{asserts.c => SDL_test.c} | 25 ++- .../tests/{asserts.h => SDL_test.h} | 9 +- test/test-automation/tests/test.c | 24 ++- 7 files changed, 137 insertions(+), 83 deletions(-) rename test/test-automation/tests/{asserts.c => SDL_test.c} (78%) rename test/test-automation/tests/{asserts.h => SDL_test.h} (87%) diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am index 272ae7d8c..15f61dbc3 100644 --- a/test/test-automation/Makefile.am +++ b/test/test-automation/Makefile.am @@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I acinclude -I build-scripts SUBDIRS = tests bin_PROGRAMS = runner -runner_SOURCES = runner.c +runner_SOURCES = runner.c tests/SDL_test.c runner_CLAGS = -W -Wall -Wextra -g `sdl-config --cflags` -DSDL_NO_COMPAT runner_LDFLAGS = `sdl-config --libs` diff --git a/test/test-automation/configure.ac b/test/test-automation/configure.ac index 1e4c803fb..44b7a9f22 100644 --- a/test/test-automation/configure.ac +++ b/test/test-automation/configure.ac @@ -26,6 +26,9 @@ AC_CHECK_HEADERS([stdlib.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. +# without this debugging information will be stripped (at least on OS X) +CFLAGS="-g" + # Checks for library functions. AC_FUNC_FORK diff --git a/test/test-automation/runner.c b/test/test-automation/runner.c index 0f747bd20..301c3fe63 100644 --- a/test/test-automation/runner.c +++ b/test/test-automation/runner.c @@ -25,21 +25,13 @@ #include #include +#include "tests/SDL_test.h" -int main(int argc, char *argv[]) { - - // Handle command line arguments - - // print: Testing againts SDL version fuu (rev: bar) - - int failureCount = 0, passCount = 0; - - const Uint32 startTicks = SDL_GetTicks(); - +void *LoadLibrary() { #if defined(linux) || defined( __linux) char *libName = "tests/libtest.so"; -#else - char *libName = "tests/libtest.0.dylib"; +#else + char *libName = "tests/libtest.dylib"; #endif void *library = SDL_LoadObject(libName); @@ -48,71 +40,100 @@ int main(int argc, char *argv[]) { printf("%s\n", SDL_GetError()); } - const char **(*suite)(void); - suite = (const char **(*)(void)) SDL_LoadFunction(library, "suite"); + return library; +} + +char **QueryTestCases(void *library) { + char **(*suite)(void); + + suite = (char **(*)(void)) SDL_LoadFunction(library, "queryTestNames"); if(suite == NULL) { - printf("Retrieving test names failed, suite == NULL\n"); + printf("Quering test names failed, suite == NULL\n"); printf("%s\n", SDL_GetError()); - } else { - const char **tests = suite(); + } - char *testname = NULL; - int counter = 0; - for(; (testname = (char *) tests[counter]); ++counter) { - int childpid = fork(); + char **tests = suite(); + if(tests == NULL) { + printf("Failed to load test cases. tests == NULL\n"); + printf("%s\n", SDL_GetError()); + } - if(childpid == 0) { - void (*test)(void *arg); + return tests; +} - test = (void (*)(void *)) SDL_LoadFunction(library, testname); - if(test == NULL) { - printf("Loading test failed, tests == NULL\n"); - printf("%s\n", SDL_GetError()); - } else { - test(0x0); - } - return 0; // exit the child if the test didn't exit +int HandleTestReturnValue(int stat_lock) { + if(WIFEXITED(stat_lock)) { + int returnValue = WEXITSTATUS(stat_lock); + + if(returnValue == 0) { + return 1; + } + } else if(WIFSIGNALED(stat_lock)) { + int signal = WTERMSIG(stat_lock); + printf("FAILURE: test was aborted due to signal nro %d\n", signal); + //errorMsg = + //errorMsg = SDL_malloc(256 * sizeof(char)); + //sprintf(errorMsg, "was aborted due to signal nro %d", signal); + + } else if(WIFSTOPPED(stat_lock)) { + //int signal = WSTOPSIG(stat_lock); + //printf("%d: %d was stopped by signal nro %d\n", pid, child, signal); + } + + return 0; +} + + +int main(int argc, char *argv[]) { + + // Handle command line arguments + + // print: Testing againts SDL version fuu (rev: bar) + + int failureCount = 0, passCount = 0; + char *testname = NULL; + int counter = 0; + + char *libName = "libtest"; + + const Uint32 startTicks = SDL_GetTicks(); + + void *library = LoadLibrary(); + char **tests = QueryTestCases(library); + + for(testname = tests[counter]; testname; testname = tests[++counter]) { + printf("Running %s (in %s):\n", testname, libName); + + int childpid = fork(); + if(childpid == 0) { + void (*test)(void *arg); + + test = (void (*)(void *)) SDL_LoadFunction(library, testname); + if(test == NULL) { + printf("Loading test failed, tests == NULL\n"); + printf("%s\n", SDL_GetError()); } else { - int stat_lock = -1; - int child = wait(&stat_lock); + test(0x0); + } + return 0; // exit the child if the test didn't exit + } else { + int stat_lock = -1; + int child = wait(&stat_lock); - char *errorMsg = NULL; - int passed = -1; - if(WIFEXITED(stat_lock)) { - int returnValue = WEXITSTATUS(stat_lock); + int passed = -1; - if(returnValue == 0) { - passed = 1; - } else { - passed = 0; - } - } else if(WIFSIGNALED(stat_lock)) { - int signal = WTERMSIG(stat_lock); - //printf("%d: %d was killed by signal nro %d\n", pid, child, signal); - //errorMsg = - errorMsg = SDL_malloc(256 * sizeof(char)); - sprintf(errorMsg, "was aborted due to signal nro %d", signal); + passed = HandleTestReturnValue(stat_lock); - passed = 0; - } else if(WIFSTOPPED(stat_lock)) { - //int signal = WSTOPSIG(stat_lock); - //printf("%d: %d was stopped by signal nro %d\n", pid, child, signal); - } - - printf("%s (in %s):", testname, libName); - if(passed) { - passCount++; - printf("\tok\n"); - } else { - failureCount++; - printf("\tfailed\n"); - if(errorMsg) { - printf("\t%s\n", errorMsg); - SDL_free(errorMsg); - } - } + if(passed) { + passCount++; + printf("%s (in %s): ok\n", testname, libName); + } else { + failureCount++; + printf("%s (in %s): failed\n", testname, libName); } } + + printf("\n"); } SDL_UnloadObject(library); diff --git a/test/test-automation/tests/Makefile.am b/test/test-automation/tests/Makefile.am index d320ea876..015bfe2dc 100644 --- a/test/test-automation/tests/Makefile.am +++ b/test/test-automation/tests/Makefile.am @@ -1,6 +1,6 @@ lib_LTLIBRARIES = libtest.la -libtest_la_SOURCES = test.c asserts.c -libtest_la_CLAGS = -fPIC +libtest_la_SOURCES = test.c sdl_test.c +libtest_la_CLAGS = -fPIC -g libtest_la_LDFLAGS = `sdl-config --libs` distclean-local: diff --git a/test/test-automation/tests/asserts.c b/test/test-automation/tests/SDL_test.c similarity index 78% rename from test/test-automation/tests/asserts.c rename to test/test-automation/tests/SDL_test.c index 2e31911a5..d5de50155 100644 --- a/test/test-automation/tests/asserts.c +++ b/test/test-automation/tests/SDL_test.c @@ -18,21 +18,36 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _ASSERTS_C -#define _ASSERTS_C +#ifndef _SDL_TEST_C +#define _SDL_TEST_C -#include "asserts.h" +#include "SDL_test.h" #include +static int _testReturnValue; + void -assertEquals(char *message, Uint32 expected, Uint32 actual) +TestInit() +{ + _testReturnValue = 0; +} + +void +TestQuit() +{ + exit(_testReturnValue); +} + +void +AssertEquals(char *message, Uint32 expected, Uint32 actual) { if(expected != actual) { - printf("===============================\n"); + printf("\n===============================\n"); printf("Assert failed: %s\n", message); printf("Expected %d, got %d\n", expected, actual); printf("===============================\n"); + _testReturnValue = 1; } } diff --git a/test/test-automation/tests/asserts.h b/test/test-automation/tests/SDL_test.h similarity index 87% rename from test/test-automation/tests/asserts.h rename to test/test-automation/tests/SDL_test.h index 8b4f2cf5c..ceabb3a9a 100644 --- a/test/test-automation/tests/asserts.h +++ b/test/test-automation/tests/SDL_test.h @@ -18,11 +18,14 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _ASSERTS_H -#define _ASSERTS_H +#ifndef _SDL_TEST_H +#define _SDL_TEST_H #include -void assertEquals(char *message, Uint32 expected, Uint32 actual); +void TestInit(); +void TestQuit(); + +void AssertEquals(char *message, Uint32 expected, Uint32 actual); #endif diff --git a/test/test-automation/tests/test.c b/test/test-automation/tests/test.c index 941dccf03..b208fb7bd 100644 --- a/test/test-automation/tests/test.c +++ b/test/test-automation/tests/test.c @@ -25,30 +25,42 @@ #include -#include "asserts.h" +#include "SDL_test.h" -const char *names[] = {"hello", "hello2", "hello3"}; +char *names[] = {"hello", "hello2", "hello3", NULL}; -const char **suite() { +char **queryTestNames() { return names; } void hello(void *arg){ + TestInit(); + const char *revision = SDL_GetRevision(); printf("Revision is %s\n", revision); - assertEquals("will fail", 3, 5); + AssertEquals("will fail", 3, 5); + + TestQuit(); } void hello2(void *arg) { + TestInit(); + + // why this isn't segfaulting? char *msg = "eello"; msg[0] = 'H'; + + TestQuit(); } void hello3(void *arg) { - printf("hello\n"); + TestInit(); + printf("hello3\n"); - assertEquals("passes", 3, 3); + AssertEquals("passes", 3, 3); + + TestQuit(); } #endif