X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fexpressions%2Fepoch.sh;h=27184e0812ff2cbf06277b3366f88c7165efaeab;hb=538e1f5d35f8a48d43401b2c7abf7663219b638f;hp=b1efb5bb4db2a40e241c3ae04d40d2f1257fa74f;hpb=d807ad29cc0d3caa4f0e04ee4b75c70a225cfeaf;p=pspp-builds.git

diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh
index b1efb5bb..27184e08 100755
--- a/tests/expressions/epoch.sh
+++ b/tests/expressions/epoch.sh
@@ -4,16 +4,21 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 
-here=`pwd`;
+# ensure that top_srcdir and top_builddir  are absolute
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+top_srcdir=`cd $top_srcdir; pwd`
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
-# 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 +138,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 $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 +157,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 +171,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 +185,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 +199,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
@@ -212,12 +214,7 @@ DATE.DMY(1,1,87) = DATE.DMY(1,1,2087) => true
 DATE.DMY(1,1,99) = DATE.DMY(1,1,2099) => true
 DATE.DMY(1,1,100) => sysmis
 EOF
-
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-
 pass;