projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made BSD diff compatible
[pspp]
/
tests
/
command
/
oneway.sh
diff --git
a/tests/command/oneway.sh
b/tests/command/oneway.sh
index 22e88456895c137d3fc7253d2b9b2c623df9aee7..5de916748dcc3df0e52af83a40d54e083ffc5d02 100755
(executable)
--- a/
tests/command/oneway.sh
+++ b/
tests/command/oneway.sh
@@
-10,12
+10,18
@@
here=`pwd`;
# ensure that top_srcdir is absolute
cd $top_srcdir; top_srcdir=`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()
{
- rm -rf $TEMPDIR
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo Not cleaning $TEMPDIR;
+ return ;
+ fi
+ cd /
+ rm -rf $TEMPDIR
}
}
@@
-86,7
+92,8
@@
activity="run program"
$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
-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|