Changes in tests/Tesselations/defs.in [318cea:bdedb1]

File:

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

tests/Tesselations/defs.in

@@ -30 +30 @@
         CLEANUP="$CLEANUP; rm -rf $testdir"
         cp -r @srcdir@/$testdir/* $testdir/
+        cd $testdir
         CLEANUP="rm -f stderr stdout diffstderr diffstdout; cd ..; $CLEANUP"
         CLEANUP="rm -f *.conf*; rm -f NonConvexEnvelope*; rm -f ${testdir}.xyz; rm -f ${testdir}.dbond; $CLEANUP"
@@ -51 +52 @@
         FILENAME="NonConvexEnvelope"
         exitcode=0
-        cd $testdir/$RADIUS
+        cd $RADIUS
         #echo "Current dir is `pwd`, calling $MOLECUILDER $mol.conf -e $exec_prefix -p ../$mol.xyz -N $RADIUS $FILENAME."
         if [ -e $mol.dbond ]; then
@@ -61 +62 @@
         #cat stderr
         #cat stdout
-        grep -E "^[0-9]* [0-9]* [0-9]*$" ../../../../../molecuilder/tests/Tesselations/$mol/$2/${FILENAME}-$mol.dat | sort -n >reference-triangles.dat
-        grep -E "^[0-9]* [0-9]* [0-9]*$" ${FILENAME}.dat | sort -n >new-triangles.dat
-        diff reference-triangles.dat new-triangles.dat 2>diffstderr >diffstdout || exitcode=$?
+        diff ${FILENAME}.dat ../@srcdir@/$mol/$2/${FILENAME}-$mol.dat 2>diffstderr >diffstdout || exitcode=$?
         #echo "Diff done with exitcode $exitcode."
         #cat diffstderr
         #cat diffstdout
-        cd ../..
+        cd ..
         test $exitcode = $expected_exitcode || exit 1
 }