Minor cleaning.

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 8b7368be..a33042b1 100644
--- a/test/test-automation/src/runner/runner.c
+++ b/test/test-automation/src/runner/runner.c
@@ -1310,17 +1310,9 @@ ParseOptions(int argc, char *argv[])
    }
 }
 
-
-/*!
- * Entry point for test runner
- *
- * \param argc Count of command line arguments
- * \param argv Array of commond lines arguments
- */
-int
-main(int argc, char *argv[])
+void
+InitRunner()
 {
-	// \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));
@@ -1329,8 +1321,20 @@ main(int argc, char *argv[])
 	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
+ *
+ * \param argc Count of command line arguments
+ * \param argv Array of commond lines arguments
+ */
+int
+main(int argc, char *argv[])
+{
+	InitRunner();
+
 	ParseOptions(argc, argv);
 
 	int suiteCounter = 0;
diff --git a/test/test-automation/tests/testrender/testrender.c b/test/test-automation/tests/testrender/testrender.c
index 7a8375a0..bea2040d 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;