projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
draft pspp sav file api
[pspp]
/
tests
/
bugs
/
temporary.sh
diff --git
a/tests/bugs/temporary.sh
b/tests/bugs/temporary.sh
index 3fbe18421123e280c680ee66c281808d3b742e24..cb0042255b7615ccc91eef525a864f20ebfd8bb5 100755
(executable)
--- a/
tests/bugs/temporary.sh
+++ b/
tests/bugs/temporary.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$EXEEXT
# 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
}
@@
-49,7
+59,7
@@
cd $TEMPDIR
activity="create program"
cat > $TESTFILE <<EOF
activity="create program"
cat > $TESTFILE <<EOF
-DATA LIST LIST NOTABLE /
x
*.
+DATA LIST LIST NOTABLE /
X
*.
begin data.
1
2
begin data.
1
2
@@
-70,29
+80,29
@@
list.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
EOF
if [ $? -ne 0 ] ; then no_result ; fi
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP -o pspp.csv
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-diff -
b -B -w $TEMPDIR/pspp.list
- << EOF
- X
---------
- 6.00
- 7.00
- 8.00
- 9.00
-
- X
---------
- 1.00
- 2.00
- 3.00
- 4.00
- 5.00
- 6.00
- 7.00
- 8.00
- 9.00
+diff -
c $TEMPDIR/pspp.csv
- << EOF
+Table: Data List
+X
+6.00
+7.00
+8.00
+9.00
+
+Table: Data List
+X
+1.00
+2.00
+3.00
+4.00
+5.00
+6.00
+7.00
+8.00
+9.00
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi