diff options
| author | Lloyd Hilaiel <lloyd@hilaiel.com> | 2011-04-20 12:20:45 -0600 |
|---|---|---|
| committer | Lloyd Hilaiel <lloyd@hilaiel.com> | 2011-04-20 12:20:45 -0600 |
| commit | 9b88b94429985a8579161ea99754cfa5e66a54bb (patch) | |
| tree | 6a165f8af10271b6b3605ef9a78bc6d88a73184a /test | |
| parent | 888d390f4e3642f2bafff7e5489810cc695843d1 (diff) | |
| download | yajl-9b88b94429985a8579161ea99754cfa5e66a54bb.tar.gz | |
fixes to testing system. allowGarbage is misnamed, it actually means *forbid* garbage
Diffstat (limited to 'test')
| -rw-r--r-- | test/cases/fg_false_then_garbage.json (renamed from test/cases/ag_false_then_garbage.json) | 0 | ||||
| -rw-r--r-- | test/cases/fg_false_then_garbage.json.gold (renamed from test/cases/ag_false_then_garbage.json.gold) | 0 | ||||
| -rw-r--r-- | test/cases/fg_null_then_garbage.json (renamed from test/cases/ag_null_then_garbage.json) | 0 | ||||
| -rw-r--r-- | test/cases/fg_null_then_garbage.json.gold (renamed from test/cases/ag_null_then_garbage.json.gold) | 0 | ||||
| -rw-r--r-- | test/cases/fg_true_then_garbage.json (renamed from test/cases/ag_true_then_garbage.json) | 0 | ||||
| -rw-r--r-- | test/cases/fg_true_then_garbage.json.gold (renamed from test/cases/ag_true_then_garbage.json.gold) | 0 | ||||
| -rwxr-xr-x | test/run_tests.sh | 12 |
7 files changed, 6 insertions, 6 deletions
diff --git a/test/cases/ag_false_then_garbage.json b/test/cases/fg_false_then_garbage.json index 78f4e96..78f4e96 100644 --- a/test/cases/ag_false_then_garbage.json +++ b/test/cases/fg_false_then_garbage.json diff --git a/test/cases/ag_false_then_garbage.json.gold b/test/cases/fg_false_then_garbage.json.gold index fe8fc1a..fe8fc1a 100644 --- a/test/cases/ag_false_then_garbage.json.gold +++ b/test/cases/fg_false_then_garbage.json.gold diff --git a/test/cases/ag_null_then_garbage.json b/test/cases/fg_null_then_garbage.json index 7b65b35..7b65b35 100644 --- a/test/cases/ag_null_then_garbage.json +++ b/test/cases/fg_null_then_garbage.json diff --git a/test/cases/ag_null_then_garbage.json.gold b/test/cases/fg_null_then_garbage.json.gold index 349235c..349235c 100644 --- a/test/cases/ag_null_then_garbage.json.gold +++ b/test/cases/fg_null_then_garbage.json.gold diff --git a/test/cases/ag_true_then_garbage.json b/test/cases/fg_true_then_garbage.json index 31f9deb..31f9deb 100644 --- a/test/cases/ag_true_then_garbage.json +++ b/test/cases/fg_true_then_garbage.json diff --git a/test/cases/ag_true_then_garbage.json.gold b/test/cases/fg_true_then_garbage.json.gold index 73af6ce..73af6ce 100644 --- a/test/cases/ag_true_then_garbage.json.gold +++ b/test/cases/fg_true_then_garbage.json.gold diff --git a/test/run_tests.sh b/test/run_tests.sh index c4fa519..08fff8e 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -29,11 +29,11 @@ fi ${ECHO} "using test binary: $testBin" testsSucceeded=0 -testsTotal=0 +testsTotal=0 for file in cases/*.json ; do allowComments="-c" - allowGarbage="" + forbidGarbage="" allowMultiple="" # if the filename starts with dc_, we disallow comments for this test @@ -41,8 +41,8 @@ for file in cases/*.json ; do dc_*) allowComments="" ;; - ag_*) - allowGarbage="-g" + fg_*) + forbidGarbage="-g" ;; am_*) allowMultiple="-m"; @@ -52,10 +52,10 @@ for file in cases/*.json ; do iter=1 success="success" - ${ECHO} "$testBin $allowComments $allowGarbage $allowMultiple -b $iter < $file > ${file}.test " + ${ECHO} "$testBin $allowComments $forbidGarbage $allowMultiple -b $iter < $file > ${file}.test " # parse with a read buffer size ranging from 1-31 to stress stream parsing while [ $iter -lt 32 ] && [ $success = "success" ] ; do - $testBin $allowComments $allowGarbage $allowMultiple -b $iter < $file > ${file}.test 2>&1 + $testBin $allowComments $forbidGarbage $allowMultiple -b $iter < $file > ${file}.test 2>&1 diff ${DIFF_FLAGS} ${file}.gold ${file}.test if [ $? -eq 0 ] ; then if [ $iter -eq 31 ] ; then : $(( testsSucceeded += 1)) ; fi |