Skip to content

L
libSDL
Commit e534989e authored by Markus Kauppila's avatar Markus Kauppila
Browse files
Options

Fixed option parsing code of test harness.

parent 8cd891d7
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
test/test-automation/src/runner/runner.c
View file @ e534989e
...@@ -1146,7 +1146,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1146,7 +1146,7 @@ ParseOptions(int argc, char *argv[])
else if(SDL_strcmp(arg, "--logdir") == 0) { else if(SDL_strcmp(arg, "--logdir") == 0) {
char *dirString = NULL; char *dirString = NULL;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
dirString = argv[++i]; dirString = argv[++i];
} else { } else {
printf("runner: dir is missing\n"); printf("runner: dir is missing\n");
...@@ -1162,7 +1162,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1162,7 +1162,7 @@ ParseOptions(int argc, char *argv[])
else if(SDL_strcmp(arg, "--logfile") == 0) { else if(SDL_strcmp(arg, "--logfile") == 0) {
char *fileString = NULL; char *fileString = NULL;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
fileString = argv[++i]; fileString = argv[++i];
} else { } else {
fileString = DEFAULT_LOG_FILENAME; fileString = DEFAULT_LOG_FILENAME;
...@@ -1177,7 +1177,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1177,7 +1177,7 @@ ParseOptions(int argc, char *argv[])
universal_timeout_enabled = 1; universal_timeout_enabled = 1;
char *timeoutString = NULL; char *timeoutString = NULL;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
timeoutString = argv[++i]; timeoutString = argv[++i];
} else { } else {
printf("runner: timeout is missing\n"); printf("runner: timeout is missing\n");
...@@ -1190,7 +1190,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1190,7 +1190,7 @@ ParseOptions(int argc, char *argv[])
else if(SDL_strcmp(arg, "--seed") == 0) { else if(SDL_strcmp(arg, "--seed") == 0) {
userRunSeed = 1; userRunSeed = 1;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
runSeed = argv[++i]; runSeed = argv[++i];
} else { } else {
printf("runner: seed value is missing\n"); printf("runner: seed value is missing\n");
...@@ -1201,7 +1201,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1201,7 +1201,7 @@ ParseOptions(int argc, char *argv[])
} }
else if(SDL_strcmp(arg, "--iterations") == 0) { else if(SDL_strcmp(arg, "--iterations") == 0) {
char *iterationsString = NULL; char *iterationsString = NULL;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
iterationsString = argv[++i]; iterationsString = argv[++i];
} else { } else {
printf("runner: iterations value is missing\n"); printf("runner: iterations value is missing\n");
...@@ -1217,7 +1217,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1217,7 +1217,7 @@ ParseOptions(int argc, char *argv[])
} }
else if(SDL_strcmp(arg, "--exec-key") == 0) { else if(SDL_strcmp(arg, "--exec-key") == 0) {
char *execKeyString = NULL; char *execKeyString = NULL;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
execKeyString = argv[++i]; execKeyString = argv[++i];
} else { } else {
printf("runner: execkey value is missing\n"); printf("runner: execkey value is missing\n");
...@@ -1235,7 +1235,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1235,7 +1235,7 @@ ParseOptions(int argc, char *argv[])
only_selected_test = 1; only_selected_test = 1;
char *testName = NULL; char *testName = NULL;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
testName = argv[++i]; testName = argv[++i];
} else { } else {
printf("runner: test name is missing\n"); printf("runner: test name is missing\n");
...@@ -1249,7 +1249,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1249,7 +1249,7 @@ ParseOptions(int argc, char *argv[])
else if(SDL_strcmp(arg, "--xsl") == 0) { else if(SDL_strcmp(arg, "--xsl") == 0) {
xsl_enabled = 1; xsl_enabled = 1;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
char *stylesheet = argv[++i]; char *stylesheet = argv[++i];
if(stylesheet[0] != '-') { if(stylesheet[0] != '-') {
custom_xsl_enabled = 1; custom_xsl_enabled = 1;
...@@ -1263,7 +1263,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1263,7 +1263,7 @@ ParseOptions(int argc, char *argv[])
only_tests_with_string = 1; only_tests_with_string = 1;
char *substring = NULL; char *substring = NULL;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
substring = argv[++i]; substring = argv[++i];
} else { } else {
printf("runner: substring of test name is missing\n"); printf("runner: substring of test name is missing\n");
...@@ -1278,7 +1278,7 @@ ParseOptions(int argc, char *argv[]) ...@@ -1278,7 +1278,7 @@ ParseOptions(int argc, char *argv[])
only_selected_suite = 1; only_selected_suite = 1;
char *suiteName = NULL; char *suiteName = NULL;
if( (i + 1) < argc) { if( (i + 1) < argc && argv[i+1][0] != '-') {
suiteName = argv[++i]; suiteName = argv[++i];
} else { } else {
printf("runner: suite name is missing\n"); printf("runner: suite name is missing\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment