projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid use of $* in Makefile since it's problematic
[pspp-builds.git]
/
tests
/
bugs
/
multipass.sh
diff --git
a/tests/bugs/multipass.sh
b/tests/bugs/multipass.sh
index 50161af6e0f3024e899261971dbe183029c63a72..5272063094049e75f1513c7c8b2538bafb020f93 100755
(executable)
--- a/
tests/bugs/multipass.sh
+++ b/
tests/bugs/multipass.sh
@@
-6,10
+6,14
@@
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`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-17,6
+21,11
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-69,25
+78,25
@@
DESCRIPTIVES
EOF
if [ $? -ne 0 ] ; then no_result ; fi
EOF
if [ $? -ne 0 ] ; then no_result ; fi
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b -w $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST. Reading free-form data from INLINE.
+--------+------+
|Variable|Format|
#========#======#
|ID |F8.0 |
|ABC |F8.0 |
+--------+------+
+--------+------+
|Variable|Format|
#========#======#
|ID |F8.0 |
|ABC |F8.0 |
+--------+------+
-
2.1 DESCRIPTIVES. Valid cases = 6; cases with missing value(s) = 0.
2.1 DESCRIPTIVES. Valid cases = 6; cases with missing value(s) = 0.
-+--------#-+----
-
+-------+-------+-------+
-|Variable#N|
Mean|Std Dev|Minimum|Maximum|
-#========#=#====
=
#=======#=======#=======#
-|ABC #6|3.00
0| .837| 2.000| 4.0
00|
-+--------#-+----
-
+-------+-------+-------+
++--------#-+----+-------+-------+-------+
+|Variable#N|Mean|Std Dev|Minimum|Maximum|
+#========#=#====#=======#=======#=======#
+|ABC #6|3.00
| .84| 2.00| 4.
00|
++--------#-+----+-------+-------+-------+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi