projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Checkin of new directory structure.
[pspp-builds.git]
/
tests
/
expressions
/
epoch.sh
diff --git
a/tests/expressions/epoch.sh
b/tests/expressions/epoch.sh
index c6e7f1a73f76a604606519c3ca6bdc80271818cf..b8d88fa9f810ac6e00a153da6c28253dfaa24025 100755
(executable)
--- a/
tests/expressions/epoch.sh
+++ b/
tests/expressions/epoch.sh
@@
-4,10
+4,12
@@
TEMPDIR=/tmp/pspp-tst-$$
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
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"
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
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
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 no_result ; fi
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-
pass;
pass;