projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[pspp]
/
tests
/
command
/
t-test-1-indep-val.sh
diff --git
a/tests/command/t-test-1-indep-val.sh
b/tests/command/t-test-1-indep-val.sh
index 972818ac4fefdae29d1ad4a6e5b7bdbd4f6a0f97..01582f21c7b3b4474c56aa82d2628d066f0929ce 100755
(executable)
--- a/
tests/command/t-test-1-indep-val.sh
+++ b/
tests/command/t-test-1-indep-val.sh
@@
-4,17
+4,20
@@
# when a single value in the independent variable is given.
TEMPDIR=/tmp/pspp-tst-$$
# when a single value in the independent variable is given.
TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
here=`pwd`;
# ensure that top_srcdir is absolute
cd $top_srcdir; top_srcdir=`pwd`
here=`pwd`;
# ensure that top_srcdir is absolute
cd $top_srcdir; 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
}
@@
-47,8
+50,8
@@
mkdir -p $TEMPDIR
cd $TEMPDIR
activity="create program"
cd $TEMPDIR
activity="create program"
-cat > $TE
MPDIR/out.stat
<<EOF
-data list list /
indep * dep
*.
+cat > $TE
STFILE
<<EOF
+data list list /
INDEP * DEP
*.
begin data.
1 6
1 6
begin data.
1 6
1 6
@@
-79,12
+82,13
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$
here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$
SUPERVISOR $here/../src/pspp -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 $TEMPDIR/pspp.list - <<EOF
+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 the command file.
+--------+------+
|Variable|Format|
1.1 DATA LIST. Reading free-form data from the command file.
+--------+------+
|Variable|Format|