projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly escape marked up text in dictionary views
[pspp-builds.git]
/
tests
/
command
/
match-files.sh
diff --git
a/tests/command/match-files.sh
b/tests/command/match-files.sh
index e3827383c2eef3dc364beb4b35daa3b4963bd1b8..965539c8815fecc490e020b7e53f35b6afaba659 100755
(executable)
--- a/
tests/command/match-files.sh
+++ b/
tests/command/match-files.sh
@@
-6,10
+6,14
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/match-files.pspp
TESTFILE=$TEMPDIR/match-files.pspp
-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
STAT_CONFIG_PATH=$top_srcdir/config
@@
-17,8
+21,12
@@
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
- :
}
}
@@
-77,40
+85,40
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
cat > ff.out <<EOF
if [ $? -ne 0 ] ; then no_result ; fi
cat > ff.out <<EOF
-A B C D INA INB
-- - - - --- ---
-0 a A 1 0
-1 a B N 1 1
-1 a C 1 0
-2 a D 1 0
-3 a E O 1 1
-4 a F P 1 1
-5 a G 1 0
-5 a H 1 0
-6 a I Q 1 1
-7 a J R 1 1
-7 a K 1 0
-7 a L 1 0
-8 a M 1 0
-9 b S 0 1
+A B C D INA INB
FIRST LAST
+- - - - --- ---
----- ----
+0 a A 1 0
1 1
+1 a B N 1 1
1 0
+1 a C 1 0
0 1
+2 a D 1 0
1 1
+3 a E O 1 1
1 1
+4 a F P 1 1
1 1
+5 a G 1 0
1 0
+5 a H 1 0
0 1
+6 a I Q 1 1
1 1
+7 a J R 1 1
1 0
+7 a K 1 0
0 0
+7 a L 1 0
0 1
+8 a M 1 0
1 1
+9 b S 0 1
1 1
EOF
cat > ft.out <<EOF
EOF
cat > ft.out <<EOF
-A B C D INA INB
-- - - - --- ---
-0 a A 1 0
-1 a B N 1 1
-1 a C N 1 1
-2 a D 1 0
-3 a E O 1 1
-4 a F P 1 1
-5 a G 1 0
-5 a H 1 0
-6 a I Q 1 1
-7 a J R 1 1
-7 a K R 1 1
-7 a L R 1 1
-8 a M 1 0
+A B C D INA INB
FIRST LAST
+- - - - --- ---
----- ----
+0 a A 1 0
1 1
+1 a B N 1 1
1 0
+1 a C N 1 1
0 1
+2 a D 1 0
1 1
+3 a E O 1 1
1 1
+4 a F P 1 1
1 1
+5 a G 1 0
1 0
+5 a H 1 0
0 1
+6 a I Q 1 1
1 1
+7 a J R 1 1
1 0
+7 a K R 1 1
0 0
+7 a L R 1 1
0 1
+8 a M 1 0
1 1
EOF
# Test nonparallel match and table lookup.
EOF
# Test nonparallel match and table lookup.
@@
-135,21
+143,24
@@
$dla
$sa
$dlb
$sb
$sa
$dlb
$sb
-match files $type1='a.sys' /in=INA /$type2='b.sys' /in=INB /rename c=D /by a.
+match files $type1='a.sys' /in=INA /$type2='b.sys' /in=INB /rename c=D /by a
+ /first=FIRST /last=LAST.
EOF
elif [ $sources = sa ]; then
cat <<EOF
$dla
$sa
$dlb
EOF
elif [ $sources = sa ]; then
cat <<EOF
$dla
$sa
$dlb
-match files $type1='a.sys' /in=INA /$type2=* /in=INB /rename c=D /by a.
+match files $type1='a.sys' /in=INA /$type2=* /in=INB /rename c=D /by a
+ /first=FIRST /last=LAST.
EOF
elif [ $sources = as ]; then
cat <<EOF
$dlb
$sb
$dla
EOF
elif [ $sources = as ]; then
cat <<EOF
$dlb
$sb
$dla
-match files $type1=* /in=INA /$type2='b.sys' /in=INB /rename c=D /by a.
+match files $type1=* /in=INA /$type2='b.sys' /in=INB /rename c=D /by a
+ /first=FIRST /last=LAST.
EOF
else
activity="internal error"
EOF
else
activity="internal error"
@@
-160,11
+171,13
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
- $SUPERVISOR $
here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
+ $SUPERVISOR $
PSPP --testing-mode -e /dev/null $name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
- diff -b -w -B pspp.list $types.out
+ perl -pi -e 's/^\s*$//g' pspp.list
+ perl -pi -e 's/^\s*$//g' $types.out
+ diff -b -w pspp.list $types.out
if [ $? -ne 0 ] ; then fail ; fi
done
done
if [ $? -ne 0 ] ; then fail ; fi
done
done
@@
-183,11
+196,12
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
+$SUPERVISOR $
PSPP --testing-mode -e /dev/null $name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
-diff -b -w -B - pspp.list <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w - pspp.list <<EOF
A B C D E F
- - - - - -
0 a A 1 b N
A B C D E F
- - - - - -
0 a A 1 b N
@@
-231,11
+245,12
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
+$SUPERVISOR $
PSPP --testing-mode -e /dev/null $name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
-diff -b -w -B - pspp.list <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w - pspp.list <<EOF | perl -e 's/^\s*$//g'
x z y
-------- -------- --------
3.00 8.00 30.00
x z y
-------- -------- --------
3.00 8.00 30.00