Fixed a bunch of compiler warnings.
authorMarkus Kauppila <markus.kauppila@gmail.com>
Sat, 06 Aug 2011 19:49:37 +0300
changeset 5809 adc13772de72
parent 5808 34114b48f322
child 5810 8abe296597b1
Fixed a bunch of compiler warnings.
test/test-automation/src/libtest/xml.c
test/test-automation/src/runner/logger.h
test/test-automation/src/runner/runner.c
test/test-automation/tests/testaudio/testaudio.c
test/test-automation/tests/testrect/testrect.c
--- a/test/test-automation/src/libtest/xml.c	Sat Aug 06 19:17:05 2011 +0300
+++ b/test/test-automation/src/libtest/xml.c	Sat Aug 06 19:49:37 2011 +0300
@@ -168,7 +168,7 @@
 
 	// escape the string
 	char *curRetBuffer = retBuffer;
-	char *curString = string;
+	const char *curString =  string;
 
 	char character = *curString;
 	while( (character = *curString++) ) {
--- a/test/test-automation/src/runner/logger.h	Sat Aug 06 19:17:05 2011 +0300
+++ b/test/test-automation/src/runner/logger.h	Sat Aug 06 19:49:37 2011 +0300
@@ -22,7 +22,6 @@
 #define _LOGGER_H
 
 #include <SDL/SDL_stdinc.h>
-
 #include <time.h>
 
 /* Logging levels */
@@ -31,6 +30,7 @@
 	LOGGER_VERBOSE
 } Level;
 
+//! Default logging level
 #define LOGGER_DEFAULT_LEVEL LOGGER_TERSE
 
 //! Contains information for the logger
@@ -77,7 +77,6 @@
 
 
 /*! Function pointers to actual logging function implementations */
-
 extern RunStartedFp RunStarted;
 extern RunEndedFp RunEnded;
 extern SuiteStartedFp SuiteStarted;
@@ -89,8 +88,4 @@
 extern AssertSummaryFp AssertSummary;
 extern LogFp Log;
 
-//! Run seed for harness
-extern char *runSeed;
-
-
 #endif
--- a/test/test-automation/src/runner/runner.c	Sat Aug 06 19:17:05 2011 +0300
+++ b/test/test-automation/src/runner/runner.c	Sat Aug 06 19:49:37 2011 +0300
@@ -180,6 +180,8 @@
 CountFailedAssertsFp LoadCountFailedAssertsFunction(void *suite);
 void KillHungTestInChildProcess(int signum);
 void UnloadTestSuites(TestSuiteReference *suites);
+int FilterTestCase(TestCaseReference *testReference);
+int HandleChildProcessReturnValue(int stat_lock);
 
 
 /*! Pointers to selected logger implementation */
@@ -232,7 +234,7 @@
 		exit(2);
 	}
 
-	while(entry = readdir(directory)) {
+	while( (entry = readdir(directory)) ) {
 		 // discards . and .. and hidden files starting with dot and directories etc.
 		if(strlen(entry->d_name) > 2 && entry->d_name[0] != '.' && entry->d_type == DT_REG) {
 			const char *delimiters = ".";
@@ -707,8 +709,8 @@
 	 */
 	int timeoutInMilliseconds = tm * 1000;
 
-	SDL_TimerID timerID = SDL_AddTimer(timeoutInMilliseconds, callback, 0x0);
-	if(timerID == NULL) {
+	SDL_TimerID timerID = SDL_AddTimer(timeoutInMilliseconds, (SDL_TimerCallback) callback, 0x0);
+	if(timerID == 0) {
 		fprintf(stderr, "Error: Creation of SDL timer failed.\n");
 		fprintf(stderr, "Error: %s\n", SDL_GetError());
 	}
@@ -734,6 +736,8 @@
 void
 KillHungTestInChildProcess(int signum)
 {
+	(void)signum; // keeps the compiler silent about unused variable
+
 	exit(TEST_RESULT_KILLED);
 }
 
@@ -829,7 +833,7 @@
 			exit(RunTest(testItem, execKey));
 		} else {
 			int stat_lock = -1;
-			int child = wait(&stat_lock);
+			wait(&stat_lock);
 
 			retVal = HandleChildProcessReturnValue(stat_lock);
 		}
@@ -986,7 +990,7 @@
 	if(xml_enabled) {
 		char *sheet = NULL;
 		if(xsl_enabled) {
-			sheet = "style.xsl"; // default style sheet;
+			sheet = (char *) defaultXslSheet;
 		}
 
 		if(custom_xsl_enabled) {
@@ -1285,7 +1289,6 @@
 
 	ParseOptions(argc, argv);
 
-	char *testSuiteName = NULL;
 	int suiteCounter = 0;
 
 #if defined(linux) || defined( __linux)
--- a/test/test-automation/tests/testaudio/testaudio.c	Sat Aug 06 19:17:05 2011 +0300
+++ b/test/test-automation/tests/testaudio/testaudio.c	Sat Aug 06 19:49:37 2011 +0300
@@ -31,6 +31,23 @@
 	return (TestCaseReference **)testSuite;
 }
 
+// Fixture
+
+void
+SetUp(void *arg)
+{
+	/* Start SDL. */
+	int ret = SDL_Init( SDL_INIT_AUDIO );
+	AssertTrue(ret==0, "SDL_Init(SDL_INIT_AUDIO): %s", SDL_GetError());
+}
+
+void
+TearDown(void *arg)
+{
+	/* Quit SDL. */
+	SDL_Quit();
+}
+
 /* Test case functions */
 
 /**
@@ -40,11 +57,7 @@
 {
    int ret;
    int i, n;
-   char *name;
-
-   /* Start SDL. */
-   ret = SDL_Init( SDL_INIT_AUDIO );
-   AssertTrue(ret==0, "SDL_Init(SDL_INIT_AUDIO): %s", SDL_GetError());
+   const char *name;
 
    /* Get number of devices. */
    n = SDL_GetNumAudioDevices(0);
@@ -59,9 +72,6 @@
          AssertTrue(strlen(name)>0, "name blank");
       }
    }
-
-   /* Quit SDL. */
-   SDL_Quit();
 }
 
 /**
@@ -71,11 +81,7 @@
 {
    int ret;
    int i, n;
-   char *name;
-
-   /* Start SDL. */
-   ret = SDL_Init( SDL_INIT_AUDIO );
-   AssertTrue(ret==0, "SDL_Init(SDL_INIT_AUDIO): %s", SDL_GetError());
+   const char *name;
 
    /* Get number of devices. */
    n = SDL_GetNumAudioDevices(1);
@@ -90,9 +96,6 @@
          AssertTrue(strlen(name)>0, "name empty");
       }
    }
-
-   /* Quit SDL. */
-   SDL_Quit();
 }
 
 /**
@@ -101,7 +104,7 @@
 int audio_printAudioDrivers()
 {
    int i, n;
-   char *name;
+   const char *name;
 
    /* Get number of drivers */
    n = SDL_GetNumAudioDrivers();
@@ -124,17 +127,10 @@
 int audio_printCurrentAudioDriver()
 {
    int ret;
-   char *name;
-
-   /* Start SDL. */
-   ret = SDL_Init(SDL_INIT_AUDIO);
-   AssertTrue(ret==0, "SDL_Init(SDL_INIT_AUDIO): %s", SDL_GetError());
+   const char *name;
 
    /* Check current audio driver */
    name = SDL_GetCurrentAudioDriver();
    AssertTrue(name != NULL, "name != NULL");
    AssertTrue(strlen(name)>0, "name empty");
-   
-   /* Quit SDL. */
-   SDL_Quit();   
 }
--- a/test/test-automation/tests/testrect/testrect.c	Sat Aug 06 19:17:05 2011 +0300
+++ b/test/test-automation/tests/testrect/testrect.c	Sat Aug 06 19:49:37 2011 +0300
@@ -12,14 +12,10 @@
 static const TestCaseReference test1 =
 		(TestCaseReference){ "rect_testIntersectRectAndLine", "description", TEST_ENABLED, 0, 0 };
 
-static const TestCaseReference test2 =
-		(TestCaseReference){ "rect_testIntersectRectAndLineFuzzed", "Tests rect to line intersection with fuzzed values", TEST_ENABLED, 0, 0 };
-
-
 
 /* Test suite */
 extern const TestCaseReference *testSuite[] =  {
-	&test1, &test2, NULL
+	&test1, NULL
 };
 
 TestCaseReference **QueryTestSuite() {
@@ -139,29 +135,3 @@
         "diagonal line to upper right was incorrectly clipped: %d,%d - %d,%d",
         x1, y1, x2, y2);
 }
-
-/*!
- * \brief Tests SDL_IntersectRectAndLine()
- *
- * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine
- */
-int rect_testIntersectRectAndLineFuzzed(void *arg)
-{
-	SDL_Rect rect = { 0, 0, RandomInteger(), RandomInteger() };
-    int x1, y1;
-    int x2, y2;
-    SDL_bool clipped;
-
-    x1 = -RandomInteger();
-    y1 = RandomInteger();
-    x2 = -RandomInteger();
-    y2 = RandomInteger();
-    clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2);
-
-    AssertTrue( !clipped,
-                /*&& x1 == -10 && y1 == 0 && x2 == -10 && y2 == 31, */
-                "line outside to the left was incorrectly clipped: %d,%d - %d,%d",
-                x1, y1, x2, y2);
-}
-