projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformat GNULIB_MODULES list to make it more maintainable.
[pspp]
/
tests
/
command
/
trimmed-mean.sh
diff --git
a/tests/command/trimmed-mean.sh
b/tests/command/trimmed-mean.sh
index 70b79918e0858873ecc4cbd44442d11368df0e0a..bb8cc227355316bb866077f61ce3a4f99b2f1483 100755
(executable)
--- a/
tests/command/trimmed-mean.sh
+++ b/
tests/command/trimmed-mean.sh
@@
-6,10
+6,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
@@
-17,6
+21,7
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-69,20
+74,20
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
-o raw-ascii $TESTFILE
+$SUPERVISOR $
PSPP
-o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
-diff -b -B $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST. Reading free-form data from INLINE.
+--------+------+
|Variable|Format|
#========#======#
|X |F8.0 |
|C |F8.0 |
+--------+------+
+--------+------+
|Variable|Format|
#========#======#
|X |F8.0 |
|C |F8.0 |
+--------+------+
-
2.1 EXAMINE. Case Processing Summary
#=#===============================#
# # Cases #
2.1 EXAMINE. Case Processing Summary
#=#===============================#
# # Cases #
@@
-93,7
+98,6
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
#=#==#=======#=#=======#==#=======#
#X#52| 100%|0| 0%|52| 100%#
#=#==#=======#=#=======#==#=======#
#=#==#=======#=#=======#==#=======#
#X#52| 100%|0| 0%|52| 100%#
#=#==#=======#=#=======#==#=======#
-
2.2 EXAMINE. Descriptives
#============================================#=========#==========#
# #Statistic|Std. Error#
2.2 EXAMINE. Descriptives
#============================================#=========#==========#
# #Statistic|Std. Error#
@@
-112,7
+116,6
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
# Skewness # 1.194 | .330 #
# Kurtosis # 15.732 | .650 #
#============================================#=========#==========#
# Skewness # 1.194 | .330 #
# Kurtosis # 15.732 | .650 #
#============================================#=========#==========#
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi