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

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed option parsing code of test harness.
  • Loading branch information
mkauppila committed Sep 18, 2011
1 parent ef720da commit d394510
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions test/test-automation/src/runner/runner.c
Expand Up @@ -1146,7 +1146,7 @@ ParseOptions(int argc, char *argv[])
else if(SDL_strcmp(arg, "--logdir") == 0) {
char *dirString = NULL;

if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
dirString = argv[++i];
} else {
printf("runner: dir is missing\n");
Expand All @@ -1162,7 +1162,7 @@ ParseOptions(int argc, char *argv[])
else if(SDL_strcmp(arg, "--logfile") == 0) {
char *fileString = NULL;

if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
fileString = argv[++i];
} else {
fileString = DEFAULT_LOG_FILENAME;
Expand All @@ -1177,7 +1177,7 @@ ParseOptions(int argc, char *argv[])
universal_timeout_enabled = 1;
char *timeoutString = NULL;

if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
timeoutString = argv[++i];
} else {
printf("runner: timeout is missing\n");
Expand All @@ -1190,7 +1190,7 @@ ParseOptions(int argc, char *argv[])
else if(SDL_strcmp(arg, "--seed") == 0) {
userRunSeed = 1;

if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
runSeed = argv[++i];
} else {
printf("runner: seed value is missing\n");
Expand All @@ -1201,7 +1201,7 @@ ParseOptions(int argc, char *argv[])
}
else if(SDL_strcmp(arg, "--iterations") == 0) {
char *iterationsString = NULL;
if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
iterationsString = argv[++i];
} else {
printf("runner: iterations value is missing\n");
Expand All @@ -1217,7 +1217,7 @@ ParseOptions(int argc, char *argv[])
}
else if(SDL_strcmp(arg, "--exec-key") == 0) {
char *execKeyString = NULL;
if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
execKeyString = argv[++i];
} else {
printf("runner: execkey value is missing\n");
Expand All @@ -1235,7 +1235,7 @@ ParseOptions(int argc, char *argv[])
only_selected_test = 1;
char *testName = NULL;

if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
testName = argv[++i];
} else {
printf("runner: test name is missing\n");
Expand All @@ -1249,7 +1249,7 @@ ParseOptions(int argc, char *argv[])
else if(SDL_strcmp(arg, "--xsl") == 0) {
xsl_enabled = 1;

if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
char *stylesheet = argv[++i];
if(stylesheet[0] != '-') {
custom_xsl_enabled = 1;
Expand All @@ -1263,7 +1263,7 @@ ParseOptions(int argc, char *argv[])
only_tests_with_string = 1;
char *substring = NULL;

if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
substring = argv[++i];
} else {
printf("runner: substring of test name is missing\n");
Expand All @@ -1278,7 +1278,7 @@ ParseOptions(int argc, char *argv[])
only_selected_suite = 1;

char *suiteName = NULL;
if( (i + 1) < argc) {
if( (i + 1) < argc && argv[i+1][0] != '-') {
suiteName = argv[++i];
} else {
printf("runner: suite name is missing\n");
Expand Down

0 comments on commit d394510

Please sign in to comment.