FIX: some gotchas in test.sh
authorChristian Thaeter <ct@pipapo.org>
Tue, 3 Aug 2010 03:13:24 +0000 (05:13 +0200)
committerChristian Thaeter <ct@pipapo.org>
Tue, 3 Aug 2010 03:13:24 +0000 (05:13 +0200)
tests/test.sh

index 186d0ac..884edb7 100755 (executable)
@@ -141,7 +141,7 @@ if [ "$VALGRINDFLAGS" = 'DISABLE' ]; then
     echo "valgrind explicit disabled"
 else
     if [ "$(which valgrind)" ]; then
-       ulimit -S -t ${ULIMIT_VG_CPU:-20} -v ${ULIMIT_VG_VSZ:-524288}
+       ulimit -S -t ${LIMIT_VG_CPU:-20} -v ${LIMIT_VG_VSZ:-524288}
         LIMIT_TIME_REAL="$LIMIT_VG_TIME"
         if [[ -x 'vgsuppression' ]]; then
             if [[ 'vgsuppression' -nt 'vgsuppression.supp' ]]; then
@@ -214,7 +214,7 @@ function compare_template() # template plainfile
             'literal:')
                 if [[ "$line" = "$arg" ]]; then
                     IFS='' read -u 3 -r template && IFS='' read -u 4 -r line || {
-                        return 1
+                        return 0
                     }
                 else
                     echo -e "'$line':$lineno\ndoes not match\n$template:$templateno"