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
/
oneway-with-splits.sh
diff --git
a/tests/command/oneway-with-splits.sh
b/tests/command/oneway-with-splits.sh
index c9eec5d55b5243396f1a5c84ed9607273cd3ba8f..33cacd121ee213ce5fe57159ed69af2d3d11dab2 100755
(executable)
--- a/
tests/command/oneway-with-splits.sh
+++ b/
tests/command/oneway-with-splits.sh
@@
-6,17
+6,27
@@
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()
{
- rm -rf $TEMPDIR
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo Not cleaning $TEMPDIR;
+ return ;
+ fi
+ cd /
+ rm -rf $TEMPDIR
}
}
@@
-49,7
+59,7
@@
cd $TEMPDIR
activity="create program"
cat > $TESTFILE <<EOF
activity="create program"
cat > $TESTFILE <<EOF
-DATA LIST LIST /
quality * brand * s
*.
+DATA LIST LIST /
QUALITY * BRAND * S
*.
BEGIN DATA
3 1 1
2 1 1
BEGIN DATA
3 1 1
2 1 1
@@
-86,11
+96,12
@@
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
if [ $? -ne 0 ] ; then no_result ; fi
-diff -b -B $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 $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+1.1 DATA LIST. Reading free-form data from INLINE.
+--------+------+
|Variable|Format|
#========#======#
+--------+------+
|Variable|Format|
#========#======#