X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=test%2Ftest-valid;h=46d4edfb6c208fa0ed77f70874d5833b5d4de0b6;hb=50031440a3b7ab2623e9468bd20e837250250cd9;hp=da22f41ce6dfe954802fbfc6a33262e5820b2ab7;hpb=20efe4aa261bb997dc5f5d64e51a5db20583f960;p=jansson.git

diff --git a/test/test-valid b/test/test-valid
index da22f41..46d4edf 100755
--- a/test/test-valid
+++ b/test/test-valid
@@ -1,30 +1,34 @@
 #!/bin/sh
+#
+# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
+#
+# Jansson is free software; you can redistribute it and/or modify
+# it under the terms of the MIT license. See LICENSE for details.
 
-TESTFILES="${srcdir}/testdata/valid"
-TMPDIR="tmp"
+TESTFILES="${srcdir}/testdata/valid ${srcdir}/testdata/valid-strip"
 
 run_test() {
     local prog=$1
-    local input=$2
-    local output=$3
-    run_testprog $prog $TMPDIR/$input
-    if ! ${srcdir}/json-compare.py $TMPDIR/$input $TMPDIR/output \
-        >$TMPDIR/cmp-output
+    local prefix=$2
+
+    run_testprog $prog $prefix
+
+    if ! ${srcdir}/json-compare.py $prefix.in $prefix.$prog.stdout \
+        >$prefix.$prog.cmp-stdout
     then
-        echo "### $input ($prog) failed:" >&2
-        cat $TMPDIR/$input >&2
-        if [ -f $TMPDIR/output ]; then
+        echo >&2
+        echo "### $prefix ($prog) failed:" >&2
+        cat $prefix.in >&2
+        if [ -f $prefix.$prog.stdout ]; then
             echo "### output:" >&2
-            cat $TMPDIR/output >&2
+            cat $prefix.$prog.stdout >&2
         fi
-        if [ -s $TMPDIR/cmp-output ]; then
+        if [ -s $prefix.$prog.stdout ]; then
             echo "### compare output:" >&2
-            cat $TMPDIR/cmp-output >&2
+            cat $prefix.$prog.cmp-stdout >&2
         fi
         exit 1
     fi
-    rm -f $TMPDIR/output
-    rm -f $TMPDIR/cmp-output
 }
 
 . ${srcdir}/run-test