Changes in tests/Tesselations/defs.in [1bab08:fd3788]

File:

• tests/Tesselations/defs.in (modified) (4 diffs)

tests/Tesselations/defs.in

@@ -30 +30 @@
         CLEANUP="$CLEANUP; rm -rf $testdir"
         cp -r @srcdir@/$testdir/* $testdir/
-        CLEANUP="rm -f stderr stdout diffstderr diffstdout; cd ..; $CLEANUP"
+        CLEANUP="rm -f stderr stdout diffstderr diffstdout; $CLEANUP"
         CLEANUP="rm -f *.conf*; rm -f NonConvexEnvelope*; rm -f ${testdir}.xyz; rm -f ${testdir}.dbond; $CLEANUP"
 fi
@@ -36 +36 @@
 # debug runs should keep results
 if $DEBUG; then :; else
-        trap "eval \"$CLEANUP\"" 0 1 2 13 15
+        trap 'eval "$CLEANUP"' 0 1 2 13 15
 fi
 
@@ -52 +52 @@
         exitcode=0
         cd $testdir/$RADIUS
-        #echo "Current dir is `pwd`, calling $MOLECUILDER $mol.conf -e $exec_prefix -p ../$mol.xyz -N $RADIUS $FILENAME."
+        echo "Current dir is `pwd`, calling $MOLECUILDER $mol.conf -e $exec_prefix -p ../$mol.xyz -N $RADIUS $FILENAME."
         if [ -e $mol.dbond ]; then
                 $MOLECUILDER -i ../$mol.xyz -A $mol.dbond --select-molecule-by-id 0 -N $RADIUS --nonconvex-file $FILENAME 2>stderr >stdout || exitcode=$?
@@ -58 +58 @@
                 $MOLECUILDER -i ../$mol.xyz --select-molecule-by-id 0 -N $RADIUS --nonconvex-file $FILENAME 2>stderr >stdout || exitcode=$?
         fi
-        #echo "Molecuilder done with exitcode $exitcode."
+        echo "Molecuilder done with exitcode $exitcode."
         cd ../..
-        #cat stderr
-        #cat stdout
-        grep -E "^[0-9]* [0-9]* [0-9]*$" @srcdir@/$mol/$2/${FILENAME}-$mol.dat | sort -n >$testdir/$RADIUS/reference-triangles.dat
-        grep -E "^[0-9]* [0-9]* [0-9]*$" $testdir/$RADIUS/${FILENAME}.dat | sort -n >$testdir/$RADIUS/new-triangles.dat
-        diff $testdir/$RADIUS/reference-triangles.dat $testdir/$RADIUS/new-triangles.dat 2>$testdir/$RADIUS/diffstderr >$testdir/$RADIUS/diffstdout || exitcode=$?
-        #echo "Diff done with exitcode $exitcode."
-        #cat diffstderr
-        #cat diffstdout
-        test $exitcode = $expected_exitcode || exit 1
+        grep -E "^[0-9]* [0-9]* [0-9]*$" @srcdir@/$mol/$2/${FILENAME}-$mol.dat | sort -n >$testdir/$RADIUS/reference-triangles.dat
+        grep -E "^[0-9]* [0-9]* [0-9]*$" $testdir/$RADIUS/${FILENAME}.dat | sort -n >$testdir/$RADIUS/new-triangles.dat
+        diff $testdir/$RADIUS/reference-triangles.dat $testdir/$RADIUS/new-triangles.dat 2>$testdir/$RADIUS/diffstderr >$testdir/$RADIUS/diffstdout || exitcode=$?
+
+        if test $exitcode = $expected_exitcode; then
+                :
+        else
+                CLEANUP=
+                exit 1
+        fi
 }