pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor refactorings.

Browse source
This commit is contained in:
Markus Kauppila 2011-06-06 18:37:53 +03:00
parent d9ce7a4a40
commit 736c0e2a65
1 changed files with 42 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

29
test/test-automation/runner.c
View file

@ -255,7 +255,8 @@ ExecuteTest(void *suite, TestCaseReference *testReference) {
/*!
* Prints usage information
*/
void printUsage() {
void
printUsage() {
printf("Usage: ./runner [--in-proc] [--suite SUITE] [--test TEST] [--help]\n");
printf("Options:\n");
printf(" --in-proc Executes tests in-process\n");
@ -344,17 +345,16 @@ SuiteIsSelected(char *testSuiteName) {
char buffer[NAME_BUFFER_SIZE];
int len = strlen(testSuiteName);
//! \todo Fix this, it's rather horrible way to do it
#define DIR_NAME_LENGTH 6
const int dirNameLength = 6;
#if defined(linux) || defined( __linux)
#define FILE_EXT_LENGTH 3
const int fileExtLength = 3;
#else
#define FILE_EXT_LENGTH 6
const int fileExtLength = 6;
#endif
int length = len - DIR_NAME_LENGTH - FILE_EXT_LENGTH;
int length = len - dirNameLength - fileExtLength;
memset(buffer, 0, NAME_BUFFER_SIZE);
memcpy(buffer, testSuiteName + DIR_NAME_LENGTH, length);
memcpy(buffer, testSuiteName + dirNameLength, length);
retVal = SDL_strncmp(selected_suite_name, buffer, NAME_BUFFER_SIZE) == 0;
}
@ -377,19 +377,15 @@ main(int argc, char *argv[])
// print: Testing against SDL version fuu (rev: bar) if verbose == true
int failureCount = 0, passCount = 0;
const Uint32 startTicks = SDL_GetTicks();
char **testSuiteNames = ScanForTestSuites();
char *testSuiteName = NULL;
int suiteCounter = 0;
const Uint32 startTicks = SDL_GetTicks();
char **testSuiteNames = ScanForTestSuites();
for(testSuiteName = testSuiteNames[suiteCounter]; testSuiteName; testSuiteName = testSuiteNames[++suiteCounter]) {
// if the current suite isn't selected, go to next suite
if(SuiteIsSelected(testSuiteName) == 0) {
continue;
}
if(SuiteIsSelected(testSuiteName)) {
void *suite = LoadTestSuite(testSuiteName);
TestCaseReference **tests = QueryTestCases(suite);
@ -425,6 +421,7 @@ main(int argc, char *argv[])
SDL_UnloadObject(suite);
}
}
const Uint32 endTicks = SDL_GetTicks();