projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Weight cases dialog: set the sensitivity of radiobuttons.
[pspp-builds.git]
/
tests
/
command
/
tabs.sh
diff --git
a/tests/command/tabs.sh
b/tests/command/tabs.sh
index 764e747df72fe112b87f057e4f91e3d6fd437fc5..ad530f45c83cb6cbfbb89881911e3b841ce8b8e7 100755
(executable)
--- a/
tests/command/tabs.sh
+++ b/
tests/command/tabs.sh
@@
-5,16
+5,26
@@
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()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-48,7
+58,7
@@
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
begin data.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
@@
-68,12
+78,13
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
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|
#========#======#=======#======#
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#