From 1a843299374a6b5c34d656335a70235009115da4 Mon Sep 17 00:00:00 2001 From: Markus Kauppila Date: Sun, 28 Aug 2011 22:18:56 +0300 Subject: [PATCH] Minor cleaning. --- test/test-automation/src/runner/runner.c | 24 +++++++++++-------- .../tests/testrender/testrender.c | 3 +-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/test/test-automation/src/runner/runner.c b/test/test-automation/src/runner/runner.c index 8b7368be3..a33042b11 100644 --- a/test/test-automation/src/runner/runner.c +++ b/test/test-automation/src/runner/runner.c @@ -1310,6 +1310,19 @@ ParseOptions(int argc, char *argv[]) } } +void +InitRunner() +{ + // Inits some global buffers to their default values + memcpy(log_basename, (void *)DEFAULT_LOG_FILENAME, SDL_strlen(DEFAULT_LOG_FILENAME)); + memcpy(log_directory, (void *)DEFAULT_LOG_DIRECTORY, SDL_strlen(DEFAULT_LOG_DIRECTORY)); + + memset(selected_test_name, 0, NAME_BUFFER_SIZE); + memset(selected_suite_name, 0, NAME_BUFFER_SIZE); + memset(testcase_name_substring, 0, NAME_BUFFER_SIZE); + memset(xsl_stylesheet_name, 0, NAME_BUFFER_SIZE); +} + /*! * Entry point for test runner @@ -1320,16 +1333,7 @@ ParseOptions(int argc, char *argv[]) int main(int argc, char *argv[]) { - // \todo turn this into something better. - // Inits some global buffers to their default values - memcpy(log_basename, (void *)DEFAULT_LOG_FILENAME, SDL_strlen(DEFAULT_LOG_FILENAME)); - memcpy(log_directory, (void *)DEFAULT_LOG_DIRECTORY, SDL_strlen(DEFAULT_LOG_DIRECTORY)); - - memset(selected_test_name, 0, NAME_BUFFER_SIZE); - memset(selected_suite_name, 0, NAME_BUFFER_SIZE); - memset(testcase_name_substring, 0, NAME_BUFFER_SIZE); - memset(xsl_stylesheet_name, 0, NAME_BUFFER_SIZE); - + InitRunner(); ParseOptions(argc, argv); diff --git a/test/test-automation/tests/testrender/testrender.c b/test/test-automation/tests/testrender/testrender.c index 7a8375a0a..bea2040d5 100644 --- a/test/test-automation/tests/testrender/testrender.c +++ b/test/test-automation/tests/testrender/testrender.c @@ -501,8 +501,7 @@ _testBlitBlendMode( SDL_Texture * tface, int mode ) SDL_Rect rect; /* Clear surface. */ - if (_clearScreen()) - return -1; + _clearScreen(); /* Steps to take. */ ni = SCREEN_W - FACE_W;