projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Greatly simplify PSPP configuration.
[pspp-builds.git]
/
tests
/
command
/
rename.sh
diff --git
a/tests/command/rename.sh
b/tests/command/rename.sh
index bb63003c7274cc689236cd9e5042afbe9e7b43ac..1e08782a4af0dc434c4008ce5b855683b053dfaa 100755
(executable)
--- a/
tests/command/rename.sh
+++ b/
tests/command/rename.sh
@@
-5,16
+5,28
@@
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
+
+PSPP=$top_builddir/src/ui/terminal/pspp
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-68,7
+80,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP -o pspp.csv
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="check sysfile"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check sysfile"
@@
-76,29
+88,25
@@
grep -i Brake $TEMPDIR/rename.sav
if [ $? -eq 0 ] ; then fail ; fi
activity="compare output"
if [ $? -eq 0 ] ; then fail ; fi
activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST. Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|BRAKEFLU|F8.0 |
-|Y |F8.0 |
-+--------+------+
-
-BRAKEFLU Y
--------- --------
- 1.00 3.00
- 2.00 3.00
- 3.00 3.00
- 4.00 3.00
-
-APPLECAR Y
--------- --------
- 1.00 3.00
- 2.00 3.00
- 3.00 3.00
- 4.00 3.00
-
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+brakeFluid,F8.0
+y,F8.0
+
+Table: Data List
+brakeFluid,y
+1.00,3.00
+2.00,3.00
+3.00,3.00
+4.00,3.00
+
+Table: Data List
+applecarts,y
+1.00,3.00
+2.00,3.00
+3.00,3.00
+4.00,3.00
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi