Changes in tests/Tesselations/defs.in [491876:bdedb1]

File:

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

tests/Tesselations/defs.in

@@ -24 +24 @@
 if $need_testdir
 then
-        if $testdir_exists; then :; else
-                mkdir $testdir
-                CLEANUP="$CLEANUP; rmdir $testdir"
+        if $testdir_exists; then
+                rm -rf $testdir
         fi
-        cp  @srcdir@/$testdir/* $testdir/
+        mkdir $testdir
+        CLEANUP="$CLEANUP; rm -rf $testdir"
+        cp -r @srcdir@/$testdir/* $testdir/
         cd $testdir
         CLEANUP="rm -f stderr stdout diffstderr diffstdout; cd ..; $CLEANUP"
@@ -51 +52 @@
         FILENAME="NonConvexEnvelope"
         exitcode=0
-        #echo "Current dir is `pwd`, calling $MOLECUILDER $mol.conf -e $exec_prefix -p $mol.xyz -c 5. 5. 5. -N $RADIUS $FILENAME."
+        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
-                $MOLECUILDER $mol.conf -e $exec_prefix -p $mol.xyz -c 5. 5. 5. -A $mol.dbond -N $RADIUS $FILENAME 2>stderr >stdout || exitcode=$?
+                $MOLECUILDER $mol.conf -e $exec_prefix -p ../$mol.xyz -A $mol.dbond -N $RADIUS $FILENAME 2>stderr >stdout || exitcode=$?
         else
-                $MOLECUILDER $mol.conf -e $exec_prefix -p $mol.xyz -c 5. 5. 5. -N $RADIUS $FILENAME 2>stderr >stdout || exitcode=$?
+                $MOLECUILDER $mol.conf -e $exec_prefix -p ../$mol.xyz -N $RADIUS $FILENAME 2>stderr >stdout || exitcode=$?
         fi
+        #echo "Molecuilder done with exitcode $exitcode."
         #cat stderr
         #cat stdout
-        #diff ${FILENAME}.dat @srcdir@/$mol/${FILENAME}-$mol.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 ..
         test $exitcode = $expected_exitcode || exit 1
 }