X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fexpressions%2Fepoch.sh;h=b8d88fa9f810ac6e00a153da6c28253dfaa24025;hb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;hp=c6e7f1a73f76a604606519c3ca6bdc80271818cf;hpb=ece7245b6bf64b2d3d8a50472d18bbe176c982d4;p=pspp-builds.git

diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh
index c6e7f1a7..b8d88fa9 100755
--- a/tests/expressions/epoch.sh
+++ b/tests/expressions/epoch.sh
@@ -4,10 +4,12 @@
 
 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`
 
-# ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -135,7 +137,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
+$SUPERVISOR $top_builddir/src/pspp --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
 
 activity="compare results"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/epoch.out
@@ -211,12 +213,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;