projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datasheet-test: Make variable "const".
[pspp-builds.git]
/
tests
/
bugs
/
overwrite-input-file.sh
diff --git
a/tests/bugs/overwrite-input-file.sh
b/tests/bugs/overwrite-input-file.sh
index 8c1fecddbb666e9c9f713a2007e915e17782aa68..a255b2fcda10aac263741dbafebf0cf197022baf 100755
(executable)
--- a/
tests/bugs/overwrite-input-file.sh
+++ b/
tests/bugs/overwrite-input-file.sh
@@
-22,6
+22,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
}
@@
-162,29
+166,30
@@
$SUPERVISOR $PSPP --testing-mode $TESTFILE -e /dev/null
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
-diff -b pspp.list - << EOF
- X Y
--------- --------
- 1.00 2.00
- 2.00 3.00
- 3.00 4.00
- 4.00 5.00
- 5.00 6.00
-X Y
-- --------
-1 3.00
-2 4.00
-3 5.00
-4 6.00
-5 7.00
-X Y
-- --------
-1 4.00
-2 5.00
-3 6.00
-4 7.00
-5 8.00
+diff -c pspp.csv - << EOF
+Table: Data List
+X,Y
+1.00,2.00
+2.00,3.00
+3.00,4.00
+4.00,5.00
+5.00,6.00
+
+Table: Data List
+X,Y
+1,3.00
+2,4.00
+3,5.00
+4,6.00
+5,7.00
+
+Table: Data List
+X,Y
+1,4.00
+2,5.00
+3,6.00
+4,7.00
+5,8.00
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi