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
/
command
/
import-export.sh
diff --git
a/tests/command/import-export.sh
b/tests/command/import-export.sh
index 342bc8b0452c126574e244913c459e63812b2d24..0cb178bf5776ade7e26ac28b5218f2eefd18e70f 100755
(executable)
--- a/
tests/command/import-export.sh
+++ b/
tests/command/import-export.sh
@@
-5,10
+5,14
@@
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`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-16,6
+20,10
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
cd /
rm -rf $TEMPDIR
}
@@
-53,7
+61,7
@@
cat > $TESTFILE <<EOF
DATA LIST LIST NOTABLE /X Y.
BEGIN DATA.
1 2
DATA LIST LIST NOTABLE /X Y.
BEGIN DATA.
1 2
-3
4
+3
.
5 6
END DATA.
5 6
END DATA.
@@
-66,7
+74,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp --testing-mode -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"
@@
-75,7
+83,7
@@
diff -b $TEMPDIR/pspp.list - << EOF
X Y
-------- --------
1.00 2.00
X Y
-------- --------
1.00 2.00
- 3.00
4.00
+ 3.00
.
5.00 6.00
EOF
if [ $? -ne 0 ] ; then fail ; fi
5.00 6.00
EOF
if [ $? -ne 0 ] ; then fail ; fi