projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove write-only variable from interaction_case_data.
[pspp-builds.git]
/
tests
/
command
/
split-file.sh
diff --git
a/tests/command/split-file.sh
b/tests/command/split-file.sh
index 2c2d57378dfc306dacf7e4c302575207e45e83a9..eb2c991c1e97d328d120c76fe9915c67fbde93d3 100755
(executable)
--- a/
tests/command/split-file.sh
+++ b/
tests/command/split-file.sh
@@
-5,17
+5,29
@@
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
+LANG=C
+export LANG
+
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-73,14
+85,14
@@
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 -o raw-ascii
$TEMPDIR/split.stat
+$SUPERVISOR $
PSPP --testing-mode
$TEMPDIR/split.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
Variable Value Label
X 1
Variable Value Label
X 1
-
X Y
- -
1 2
X Y
- -
1 2
@@
-89,10
+101,8
@@
X Y
1 9
1 5
1 4
1 9
1 5
1 4
-
Variable Value Label
X 2
Variable Value Label
X 2
-
X Y
- -
2 7
X Y
- -
2 7