projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add necessary #include stddef.h directive
[pspp-builds.git]
/
tests
/
command
/
no_case_size.sh
diff --git
a/tests/command/no_case_size.sh
b/tests/command/no_case_size.sh
index d8e1893590fa5a96bbb8e909dacb5b4188eee0fb..0c94051a1eb8e5e8098e42d5b50cee7b5938a483 100755
(executable)
--- a/
tests/command/no_case_size.sh
+++ b/
tests/command/no_case_size.sh
@@
-7,12
+7,17
@@
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()
@@
-21,6
+26,7
@@
cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-52,6
+58,7
@@
mkdir -p $TEMPDIR
cd $TEMPDIR
cd $TEMPDIR
+activity="create program"
cat <<EOF > $TESTFILE
GET FILE='$top_srcdir/tests/no_case_size.sav'.
DISPLAY DICTIONARY.
cat <<EOF > $TESTFILE
GET FILE='$top_srcdir/tests/no_case_size.sav'.
DISPLAY DICTIONARY.
@@
-61,67
+68,49
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp --testing-mode -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $
PSPP --testing-mode $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|
#========#===========================================#========#
-|
CONT
|continents of the world | 1|
+|
cont
|continents of the world | 1|
| |Format: A32 | |
| |Format: A32 | |
+| |Measure: Nominal | |
+| |Display Alignment: Left | |
+| |Display Width: 8 | |
+--------+-------------------------------------------+--------+
+--------+-------------------------------------------+--------+
-|
SIZE
|sq km | 2|
+|
size
|sq km | 2|
| |Format: F8.2 | |
| |Format: F8.2 | |
+| |Measure: Nominal | |
+| |Display Alignment: Left | |
+| |Display Width: 8 | |
+--------+-------------------------------------------+--------+
+--------+-------------------------------------------+--------+
-|
POP
|population | 3|
+|
pop
|population | 3|
| |Format: F8.2 | |
| |Format: F8.2 | |
+| |Measure: Nominal | |
+| |Display Alignment: Left | |
+| |Display Width: 8 | |
+--------+-------------------------------------------+--------+
+--------+-------------------------------------------+--------+
-|
COUNT
|number of countries | 4|
+|
count
|number of countries | 4|
| |Format: F8.2 | |
| |Format: F8.2 | |
+| |Measure: Nominal | |
+| |Display Alignment: Left | |
+| |Display Width: 8 | |
+--------+-------------------------------------------+--------+
+--------+-------------------------------------------+--------+
-
- CONT SIZE POP COUNT
+ cont size pop count
-------------------------------- -------- -------- --------
-------------------------------- -------- -------- --------
-Asia
-
-
-
-
-Africa
-
-
-
-
-North Am
-erica
-
-
-
-South Am
-erica
-
-
-
-Antarcti
-ca
-
-
-
-Europe
-
-
-
-
-Australi
-a/Oceani
-a
-
-
-
-
+Asia 44579000 3.7E+009 44.00
+Africa 30065000 7.8E+008 53.00
+North America 24256000 4.8E+008 23.00
+South America 17819000 3.4E+008 12.00
+Antarctica 13209000 .00 .00
+Europe 9938000 7.3E+008 46.00
+Australia/Oceania 7687000 31000000 14.00
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi