projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FREQUENCIES: Fix spelling error in dialog box text.
[pspp-builds.git]
/
tests
/
bugs
/
computebug.sh
diff --git
a/tests/bugs/computebug.sh
b/tests/bugs/computebug.sh
index cf9e4565545b581d128e3a9310cd3578ce0aeb9d..4ba6a9d1a375486fa55df15d60f4c1569aa17d84 100755
(executable)
--- a/
tests/bugs/computebug.sh
+++ b/
tests/bugs/computebug.sh
@@
-20,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
}
@@
-49,24
+53,42
@@
pass()
}
mkdir -p $TEMPDIR
}
mkdir -p $TEMPDIR
-
-activity="copy file"
-cp $top_srcdir/tests/bugs/computebug.stat $TEMPDIR
-if [ $? -ne 0 ] ; then no_result ; fi
-
-activity="chdir"
cd $TEMPDIR
if [ $? -ne 0 ] ; then no_result ; fi
cd $TEMPDIR
if [ $? -ne 0 ] ; then no_result ; fi
+activity="create input"
+cat > $TESTFILE <<EOF
+DATA LIST LIST
+ /A (A161)
+ B (A3).
+
+BEGIN DATA
+abc def
+ghi jkl
+END DATA.
+
+COMPUTE A=upcase(A).
+EXECUTE.
+LIST.
+EOF
activity="run program"
activity="run program"
-$SUPERVISOR $PSPP -o
raw-ascii $TEMPDIR/computebug.stat
+$SUPERVISOR $PSPP -o
pspp.csv $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $top_srcdir/tests/bugs/computebug.out
-diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/computebug.out
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+A,A161
+B,A3
+
+Table: Data List
+A,B
+ABC ,def
+GHI ,jkl
+EOF
if [ $? -ne 0 ] ; then fail ; fi
pass;
if [ $? -ne 0 ] ; then fail ; fi
pass;