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
/
tabs.sh
diff --git
a/tests/command/tabs.sh
b/tests/command/tabs.sh
index db0c688aa4dd73a3f0798eb960e90b10075ad881..ad530f45c83cb6cbfbb89881911e3b841ce8b8e7 100755
(executable)
--- a/
tests/command/tabs.sh
+++ b/
tests/command/tabs.sh
@@
-3,17
+3,28
@@
# This program tests that tab characters can be used in string input
TEMPDIR=/tmp/pspp-tst-$$
# This program tests that tab characters can be used in string input
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()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-47,13
+58,13
@@
cd $TEMPDIR
activity="create program 1"
cat > $TEMPDIR/tabs.stat <<EOF
activity="create program 1"
cat > $TEMPDIR/tabs.stat <<EOF
-data list /
x
1-80 (a).
+data list /
X
1-80 (a).
begin data.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="create program 2"
begin data.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="create program 2"
-printf "\t1\t12\t123\t1234\t12345\
t123456\t\t1234567\t12345678\tasdf\tjkl\
n" >> $TEMPDIR/tabs.stat
+printf "\t1\t12\t123\t1234\t12345\n" >> $TEMPDIR/tabs.stat
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
@@
-67,17
+78,19
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$
here/../src/pspp -o raw-ascii
$TEMPDIR/tabs.stat
+$
SUPERVISOR $PSPP --testing-mode
$TEMPDIR/tabs.stat
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 1 record 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 1 record from INLINE.
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|X | 1| 1- 80|A80 |
+--------+------+-------+------+
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|X | 1| 1- 80|A80 |
+--------+------+-------+------+
- 1 12 123 1234 12345 123456 1234567
+ 1 12 123 1234 12345
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi