vitalif
/
mdtest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #87 

Leading whitespace is stripped from each line of the ior input file.  This
allows indented comments to be treated as comments.  However it does NOT allow
one to specify excessive whitespace inside of the `ior start` and `ior stop`
magic phrases.

Also added a test to catch regressions in this functionality.
master
Glenn K. Lockwood 2018-10-05 22:50:34 -07:00
parent acee84bedc
commit d8d4742523
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/parse_options.c
View File

@ -365,6 +365,7 @@ IOR_test_t *ReadConfigScript(char *scriptName)
int runflag = 0; int runflag = 0;
char linebuf[MAX_STR]; char linebuf[MAX_STR];
char empty[MAX_STR]; char empty[MAX_STR];
char *ptr;
FILE *file; FILE *file;
IOR_test_t *head = NULL; IOR_test_t *head = NULL;
IOR_test_t *tail = NULL; IOR_test_t *tail = NULL;
@ -387,15 +388,22 @@ IOR_test_t *ReadConfigScript(char *scriptName)
/* Iterate over a block of IOR commands */ /* Iterate over a block of IOR commands */
while (fgets(linebuf, MAX_STR, file) != NULL) { while (fgets(linebuf, MAX_STR, file) != NULL) {
/* skip over leading whitespace */
ptr = linebuf;
while (isspace(*ptr))
ptr++;
/* skip empty lines */ /* skip empty lines */
if (sscanf(linebuf, "%s", empty) == -1) if (sscanf(ptr, "%s", empty) == -1)
continue; continue;
/* skip lines containing only comments */ /* skip lines containing only comments */
if (sscanf(linebuf, " #%s", empty) == 1) if (sscanf(ptr, " #%s", empty) == 1)
continue; continue;
if (contains_only(linebuf, "ior stop")) {
if (contains_only(ptr, "ior stop")) {
break; break;
} else if (contains_only(linebuf, "run")) { } else if (contains_only(ptr, "run")) {
if (runflag) { if (runflag) {
/* previous line was a "run" as well /* previous line was a "run" as well
create duplicate test */ create duplicate test */
@ -411,9 +419,9 @@ IOR_test_t *ReadConfigScript(char *scriptName)
tail->next = CreateTest(&tail->params, test_num++); tail->next = CreateTest(&tail->params, test_num++);
AllocResults(tail); AllocResults(tail);
tail = tail->next; tail = tail->next;
ParseLine(linebuf, &tail->params); ParseLine(ptr, &tail->params);
} else { } else {
ParseLine(linebuf, &tail->params); ParseLine(ptr, &tail->params);
} }
} }

3
testing/basic-tests.sh
View File

@ -23,4 +23,7 @@ IOR 2 -a POSIX -r -z -Z -Q 2 -F -k -e -i1 -m -t 100k -b 100k
IOR 2 -a POSIX -r -z -Z -Q 3 -X 13 -F -k -e -i1 -m -t 100k -b 100k IOR 2 -a POSIX -r -z -Z -Q 3 -X 13 -F -k -e -i1 -m -t 100k -b 100k
IOR 2 -a POSIX -w -z -Z -Q 1 -X -13 -F -e -i1 -m -t 100k -b 100k IOR 2 -a POSIX -w -z -Z -Q 1 -X -13 -F -e -i1 -m -t 100k -b 100k
IOR 2 -f "$ROOT/test_comments.ior"
END END

17
testing/test_comments.ior Normal file
View File

@ -0,0 +1,17 @@
# test to ensure that leading whitespace is ignored
IOR START
api=posix
writeFile =1
randomOffset=1
reorderTasks=1
filePerProc=1
keepFile=1
fsync=1
repetitions=1
multiFile=1
# tab-prefixed comment
transferSize=100k
blockSize=100k
# space-prefixed comment
run
ior stop