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
/
no_case_size.sh
diff --git
a/tests/command/no_case_size.sh
b/tests/command/no_case_size.sh
index 7f155b03d21e56df37eefe50faab618e83cb3859..25744bdc743f20201dfa7b7224d00dea19fa2f52 100755
(executable)
--- a/
tests/command/no_case_size.sh
+++ b/
tests/command/no_case_size.sh
@@
-7,10
+7,14
@@
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`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-22,6
+26,7
@@
cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-63,11
+68,12
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff -b -B -w pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w pspp.list - <<EOF
1.1 DISPLAY.
+--------+-------------------------------------------+--------+
|Variable|Description |Position|
1.1 DISPLAY.
+--------+-------------------------------------------+--------+
|Variable|Description |Position|
@@
-84,7
+90,6
@@
diff -b -B -w pspp.list - <<EOF
|COUNT |number of countries | 4|
| |Format: F8.2 | |
+--------+-------------------------------------------+--------+
|COUNT |number of countries | 4|
| |Format: F8.2 | |
+--------+-------------------------------------------+--------+
-
CONT SIZE POP COUNT
-------------------------------- -------- -------- --------
Asia 44579000 3.67E+09 44.00
CONT SIZE POP COUNT
-------------------------------- -------- -------- --------
Asia 44579000 3.67E+09 44.00
@@
-94,7
+99,6
@@
South America 17819000 3.42E+08 12.00
Antarctica 13209000 .00 .00
Europe 9938000 7.32E+08 46.00
Australia/Oceania 7687000 31000000 14.00
Antarctica 13209000 .00 .00
Europe 9938000 7.32E+08 46.00
Australia/Oceania 7687000 31000000 14.00
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi