projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid use of $* in Makefile since it's problematic
[pspp-builds.git]
/
tests
/
bugs
/
random.sh
diff --git
a/tests/bugs/random.sh
b/tests/bugs/random.sh
index 52393f43a430eb2f575ede98303038471d38ddcd..e423f3e8b4c6318241adc54718902d22a1697b41 100755
(executable)
--- a/
tests/bugs/random.sh
+++ b/
tests/bugs/random.sh
@@
-6,16
+6,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
}
@@
-52,25
+62,26
@@
cat > $TESTFILE <<EOF
set seed=10.
input program.
+ loop #i = 1 to 20.
set seed=10.
input program.
+ loop #i = 1 to 20.
-+ do repeat response=
r
1.
++ do repeat response=
R
1.
+ compute response = uniform(10).
+ end repeat.
+ end case.
+ end loop.
+ end file.
+ compute response = uniform(10).
+ end repeat.
+ end case.
+ end loop.
+ end file.
-end input program.
+end input program.
list.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
list.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
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 -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b -w $TEMPDIR/pspp.list - << EOF
R1
--------
7.71
R1
--------
7.71
@@
-93,7
+104,6
@@
diff -b -B -w $TEMPDIR/pspp.list - << EOF
2.64
.88
1.50
2.64
.88
1.50
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi