projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 25677
[pspp-builds.git]
/
tests
/
command
/
t-test-1s.sh
diff --git
a/tests/command/t-test-1s.sh
b/tests/command/t-test-1s.sh
index 30402bda176f04e86449e2b983a80910bc272d3c..4019865b52c5a8baf0b8baef12a24cc7180d7a04 100755
(executable)
--- a/
tests/command/t-test-1s.sh
+++ b/
tests/command/t-test-1s.sh
@@
-5,16
+5,26
@@
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()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-64,26
+74,25
@@
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 output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-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|
#========#======#
|ID |F8.0 |
|ABC |F8.0 |
+--------+------+
+--------+------+
|Variable|Format|
#========#======#
|ID |F8.0 |
|ABC |F8.0 |
+--------+------+
-
2.1 T-TEST. One-Sample Statistics
#===#=#====#==============#========#
# #N|Mean|Std. Deviation|SE. Mean#
#===#=#====#==============#========#
#ABC#6|3.00| .84| .342#
#===#=#====#==============#========#
2.1 T-TEST. One-Sample Statistics
#===#=#====#==============#========#
# #N|Mean|Std. Deviation|SE. Mean#
#===#=#====#==============#========#
#ABC#6|3.00| .84| .342#
#===#=#====#==============#========#
-
2.2 T-TEST. One-Sample Test
#===#=====================================================#
# # Test Value = 2.000000 #
2.2 T-TEST. One-Sample Test
#===#=====================================================#
# # Test Value = 2.000000 #