projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use rectangle_from_cell where appropriate.
[pspp]
/
tests
/
command
/
examine-extremes.sh
diff --git
a/tests/command/examine-extremes.sh
b/tests/command/examine-extremes.sh
index e4d39bdc59b1fc02ab62931cdf58eb84bc5aefb4..8524bf5e52807d0f0df5a3ee9bd43d30d91c763c 100755
(executable)
--- a/
tests/command/examine-extremes.sh
+++ b/
tests/command/examine-extremes.sh
@@
-5,16
+5,28
@@
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
+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
}
@@
-48,7
+60,7
@@
cd $TEMPDIR
activity="create program"
cat > $TESTFILE <<EOF
activity="create program"
cat > $TESTFILE <<EOF
-data list free /
v1 w
+data list free /
V1 W
begin data.
1 1
2 1
begin data.
1 1
2 1
@@
-83,11
+95,12
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
-diff $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
1.1 EXAMINE. Case Processing Summary
#==#===============================#
# # Cases #
1.1 EXAMINE. Case Processing Summary
#==#===============================#
# # Cases #
@@
-98,26
+111,24
@@
diff $TEMPDIR/pspp.list - << EOF
#==#==#=======#=#=======#==#=======#
#V1#23| 100%|0| 0%|23| 100%#
#==#==#=======#=#=======#==#=======#
#==#==#=======#=#=======#==#=======#
#V1#23| 100%|0| 0%|23| 100%#
#==#==#=======#=#=======#==#=======#
-
1.2 EXAMINE. Extreme Values
1.2 EXAMINE. Extreme Values
-#==========#===========#=====#
-# #Case Number|Value#
-#==========#===========#=====#
-#V1Highest1# 21|20.00#
-# 2# 20|19.00#
-# 3# 19|18.00#
-# 4# 19|18.00#
-# 5# 18|17.00#
-# 6# 17|16.00#
-# --------#-----------+-----#
-# Lowest1# 1| 1.00#
-# 2# 2| 2.00#
-# 3# 4| 3.00#
-# 4# 3| 3.00#
-# 5# 3| 3.00#
-# 6# 5| 4.00#
-#==========#===========#=====#
-
+#============#===========#=====#
+# #Case Number|Value#
+#============#===========#=====#
+#V1 Highest 1# 21|20.00#
+# 2# 20|19.00#
+# 3# 19|18.00#
+# 4# 19|18.00#
+# 5# 18|17.00#
+# 6# 17|16.00#
+# ----------#-----------+-----#
+# Lowest 1# 1| 1.00#
+# 2# 2| 2.00#
+# 3# 3| 3.00#
+# 4# 3| 3.00#
+# 5# 4| 3.00#
+# 6# 5| 4.00#
+#============#===========#=====#
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi