Merge branch '1.0'

[jansson.git] / test / run-test

diff --git a/test/run-test b/test/run-test
index aaaf2b7..a3ff738 100644 (file)
--- a/test/run-test
+++ b/test/run-test
@@ -1,3 +1,8 @@
+# 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.
+
 VALGRIND_CMDLINE="valgrind --leak-check=full --show-reachable=yes --track-origins=yes -q"
 
 run_testprog() {
@@ -8,7 +13,7 @@ run_testprog() {
     fi
 
     case "$prog" in
-        load_dump)
+        load_file_dump_file)
             $runner./$prog \
                 $prefix.in \
                 $prefix.$prog.stdout \
@@ -35,15 +40,14 @@ run_testprog() {
     fi
 }
 
-rm -rf testlogs
-
 for testfile in $TESTFILES; do
     tmpdir="testlogs/`basename $testfile`"
+    rm -rf $tmpdir
     mkdir -p $tmpdir
     ${srcdir}/split-testfile.py $testfile $tmpdir | while read name; do
-        run_test load_dump $tmpdir/$name
         run_test loadf_dumpf $tmpdir/$name
         run_test loads_dumps $tmpdir/$name
+        run_test load_file_dump_file $tmpdir/$name
         echo -n '.'
     done || exit 1
     echo