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
/
match-files.sh
diff --git
a/tests/command/match-files.sh
b/tests/command/match-files.sh
index e3827383c2eef3dc364beb4b35daa3b4963bd1b8..65d0f4571af54b8e3829c82018b55ec10a8b23e0 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,6
+21,7
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
:
}
rm -rf $TEMPDIR
:
}
@@
-160,11
+165,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
-o raw-ascii $name.pspp >/dev/null 2>&1
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
+190,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
-o raw-ascii $name.pspp >/dev/null 2>&1
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
+239,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
-o raw-ascii $name.pspp >/dev/null 2>&1
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