Remove devind output driver.

[pspp] / tests / expressions / epoch.sh

diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh
index b1efb5bb4db2a40e241c3ae04d40d2f1257fa74f..c6e7f1a73f76a604606519c3ca6bdc80271818cf 100755 (executable)
--- a/tests/expressions/epoch.sh
+++ b/tests/expressions/epoch.sh
@@ -9,11 +9,13 @@ here=`pwd`;
 # ensure that top_srcdir is absolute
 cd $top_srcdir; top_srcdir=`pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -133,10 +135,11 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
+$SUPERVISOR $here/../src/pspp --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
 
 activity="compare results"
-diff -b -B $TEMPDIR/epoch.out - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/epoch.out
+diff -b $TEMPDIR/epoch.out - <<EOF
 YRMODA(0,1,1) = YRMODA(1900,1,1) => true
 YRMODA(1,1,1) = YRMODA(1901,1,1) => true
 YRMODA(12,1,1) = YRMODA(1912,1,1) => true
@@ -151,7 +154,6 @@ DATE.DMY(1,1,70) = DATE.DMY(1,1,1970) => true
 DATE.DMY(1,1,87) = DATE.DMY(1,1,1987) => true
 DATE.DMY(1,1,99) = DATE.DMY(1,1,1999) => true
 DATE.DMY(1,1,100) => sysmis
-
 YRMODA(0,1,1) = YRMODA(1900,1,1) => true
 YRMODA(1,1,1) = YRMODA(1901,1,1) => true
 YRMODA(12,1,1) = YRMODA(1912,1,1) => true
@@ -166,7 +168,6 @@ DATE.DMY(1,1,70) = DATE.DMY(1,1,1970) => true
 DATE.DMY(1,1,87) = DATE.DMY(1,1,1987) => true
 DATE.DMY(1,1,99) = DATE.DMY(1,1,1999) => true
 DATE.DMY(1,1,100) => sysmis
-
 YRMODA(0,1,1) = YRMODA(1900,1,1) => true
 YRMODA(1,1,1) = YRMODA(1901,1,1) => true
 YRMODA(12,1,1) = YRMODA(1912,1,1) => true
@@ -181,7 +182,6 @@ DATE.DMY(1,1,70) = DATE.DMY(1,1,1970) => true
 DATE.DMY(1,1,87) = DATE.DMY(1,1,1987) => true
 DATE.DMY(1,1,99) = DATE.DMY(1,1,1999) => true
 DATE.DMY(1,1,100) => sysmis
-
 YRMODA(0,1,1) = YRMODA(1900,1,1) => true
 YRMODA(1,1,1) = YRMODA(1901,1,1) => true
 YRMODA(12,1,1) = YRMODA(1912,1,1) => true
@@ -196,7 +196,6 @@ DATE.DMY(1,1,70) = DATE.DMY(1,1,1970) => true
 DATE.DMY(1,1,87) = DATE.DMY(1,1,1987) => true
 DATE.DMY(1,1,99) = DATE.DMY(1,1,1999) => true
 DATE.DMY(1,1,100) => sysmis
-
 YRMODA(0,1,1) = YRMODA(1900,1,1) => true
 YRMODA(1,1,1) = YRMODA(1901,1,1) => true
 YRMODA(12,1,1) = YRMODA(1912,1,1) => true