projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document new requirement for gettext version 0.17.
[pspp]
/
tests
/
command
/
t-test-groups.sh
diff --git
a/tests/command/t-test-groups.sh
b/tests/command/t-test-groups.sh
index 1173dcc2613d33bb6b7f27485be2301cb95d013c..05cc1835fed7d7b613cd99a5ed9b4996d4359422 100755
(executable)
--- a/
tests/command/t-test-groups.sh
+++ b/
tests/command/t-test-groups.sh
@@
-3,17
+3,24
@@
# This program tests that the T-TEST /GROUPS command works
TEMPDIR=/tmp/pspp-tst-$$
# This program tests that the T-TEST /GROUPS command works
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()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-46,8
+53,8
@@
mkdir -p $TEMPDIR
cd $TEMPDIR
activity="create program"
cd $TEMPDIR
activity="create program"
-cat > $TE
MPDIR/out.stat
<<EOF
-data list list /
id * indep * dep1 * dep
2 *.
+cat > $TE
STFILE
<<EOF
+data list list /
ID * INDEP * DEP1 * DEP
2 *.
begin data.
1 1.1 1 3
2 1.1 2 4
begin data.
1 1.1 1 3
2 1.1 2 4
@@
-70,12
+77,13
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$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 | perl -e 's/^\s*$//g'
+1.1 DATA LIST. Reading free-form data from INLINE.
+--------+------+
|Variable|Format|
#========#======#
+--------+------+
|Variable|Format|
#========#======#