Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Fixed a bunch of compiler warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkauppila
mkauppila committed Aug 6, 2011
1 parent 4828b2e commit 35b0744
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 69 deletions.
2 changes: 1 addition & 1 deletion test/test-automation/src/libtest/xml.c
View file
Expand Up @@ -168,7 +168,7 @@ EscapeString(const char *string)

// escape the string
char *curRetBuffer = retBuffer;
char *curString = string;
const char *curString = string;

char character = *curString;
while( (character = *curString++) ) {
Expand Down
7 changes: 1 addition & 6 deletions test/test-automation/src/runner/logger.h
View file
Expand Up @@ -22,7 +22,6 @@
#define _LOGGER_H

#include <SDL/SDL_stdinc.h>

#include <time.h>

/* Logging levels */
Expand All @@ -31,6 +30,7 @@ typedef enum LogLevel {
LOGGER_VERBOSE
} Level;

//! Default logging level
#define LOGGER_DEFAULT_LEVEL LOGGER_TERSE

//! Contains information for the logger
Expand Down Expand Up @@ -77,7 +77,6 @@ typedef void (*LogFp)(time_t eventTime, char *fmt, ...);


/*! Function pointers to actual logging function implementations */

extern RunStartedFp RunStarted;
extern RunEndedFp RunEnded;
extern SuiteStartedFp SuiteStarted;
Expand All @@ -89,8 +88,4 @@ extern AssertWithValuesFp AssertWithValues;
extern AssertSummaryFp AssertSummary;
extern LogFp Log;

//! Run seed for harness
extern char *runSeed;


#endif
15 changes: 9 additions & 6 deletions test/test-automation/src/runner/runner.c
View file
Expand Up @@ -180,6 +180,8 @@ TestCaseTearDownFp LoadTestTearDownFunction(void *suite);
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 */
Expand Down Expand Up @@ -232,7 +234,7 @@ ScanForTestSuites(char *directoryName, char *extension)
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 = ".";
Expand Down Expand Up @@ -707,8 +709,8 @@ SetTestTimeout(int timeout, void (*callback)(int))
*/
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());
}
Expand All @@ -734,6 +736,8 @@ SetTestTimeout(int timeout, void (*callback)(int))
void
KillHungTestInChildProcess(int signum)
{
(void)signum; // keeps the compiler silent about unused variable

exit(TEST_RESULT_KILLED);
}

Expand Down Expand Up @@ -829,7 +833,7 @@ ExecuteTest(TestCase *testItem, Uint64 execKey) {
exit(RunTest(testItem, execKey));
} else {
int stat_lock = -1;
int child = wait(&stat_lock);
wait(&stat_lock);

retVal = HandleChildProcessReturnValue(stat_lock);
}
Expand Down Expand Up @@ -986,7 +990,7 @@ SetUpLogger(const int log_stdout_enabled, const int xml_enabled, const int xsl_e
if(xml_enabled) {
char *sheet = NULL;
if(xsl_enabled) {
sheet = "style.xsl"; // default style sheet;
sheet = (char *) defaultXslSheet;
}

if(custom_xsl_enabled) {
Expand Down Expand Up @@ -1285,7 +1289,6 @@ main(int argc, char *argv[])

ParseOptions(argc, argv);

char *testSuiteName = NULL;
int suiteCounter = 0;

#if defined(linux) || defined( __linux)
Expand Down
46 changes: 21 additions & 25 deletions test/test-automation/tests/testaudio/testaudio.c
View file
Expand Up @@ -31,6 +31,23 @@ TestCaseReference **QueryTestSuite() {
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 */

/**
Expand All @@ -40,11 +57,7 @@ int audio_printOutputDevices()
{
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);
Expand All @@ -59,9 +72,6 @@ int audio_printOutputDevices()
AssertTrue(strlen(name)>0, "name blank");
}
}

/* Quit SDL. */
SDL_Quit();
}

/**
Expand All @@ -71,11 +81,7 @@ int audio_printInputDevices()
{
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);
Expand All @@ -90,9 +96,6 @@ int audio_printInputDevices()
AssertTrue(strlen(name)>0, "name empty");
}
}

/* Quit SDL. */
SDL_Quit();
}

/**
Expand All @@ -101,7 +104,7 @@ int audio_printInputDevices()
int audio_printAudioDrivers()
{
int i, n;
char *name;
const char *name;

/* Get number of drivers */
n = SDL_GetNumAudioDrivers();
Expand All @@ -124,17 +127,10 @@ int audio_printAudioDrivers()
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();
}
32 changes: 1 addition & 31 deletions test/test-automation/tests/testrect/testrect.c
View file
Expand Up @@ -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() {
Expand Down Expand Up @@ -139,29 +135,3 @@ int rect_testIntersectRectAndLine (void *arg)
"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);
}

0 comments on commit 35b0744

Please sign in to comment.