projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed intialization of coefficients
[pspp]
/
tests
/
command
/
sysfiles.sh
diff --git
a/tests/command/sysfiles.sh
b/tests/command/sysfiles.sh
index e16d1612a41d10b81d3385fd04a0868e79907353..7e0dcafcaf9ce950133aa62ecfd0437283bb3fc8 100755
(executable)
--- a/
tests/command/sysfiles.sh
+++ b/
tests/command/sysfiles.sh
@@
-7,16
+7,22
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
-here=`pwd`;
+# ensure that top_builddir are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
# ensure that top_srcdir is absolute
# ensure that top_srcdir is absolute
-
cd $top_srcdir; top_srcdir=`
pwd`
+
top_srcdir=`cd $top_srcdir;
pwd`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-73,22
+79,22
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
-o raw-ascii $TESTFILE
+$SUPERVISOR $
PSPP
-o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
-VARIABLE VARIAB_A VARIAB_B VARIAB_C
--------- -------- -------- --------
- 1.00 1.00 1.00 2.00
- 1.00 1.00 2.00 30.00
-
1.00 2.00 1.00 8
.00
-
1.00 2.00 2.00 20
.00
-
2.00 1.00 1.00 2
.00
-
2.00 1.00 2.00 2
2.00
-
2.00 2.00 1.00 1
.00
-
2.00 2.00 2.00 3
.00
-
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b -w $TEMPDIR/pspp.list - << EOF
+variable001 variable002 variable003 variable004
+----------- ----------- ----------- -----------
+ 1.00 1.00 1.00 2.00
+
1.00 1.00 2.00 30
.00
+
1.00 2.00 1.00 8
.00
+
1.00 2.00 2.00 20
.00
+
2.00 1.00 1.00
2.00
+
2.00 1.00 2.00 22
.00
+
2.00 2.00 1.00 1
.00
+ 2.00 2.00 2.00 3.00
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi