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
/
command
/
split-file.sh
diff --git
a/tests/command/split-file.sh
b/tests/command/split-file.sh
index 250b97abe00eebd957617412a49bd34e2fe9c48b..5bebedc75c3b5a9960e5aa2d8dfaa3ed739ba2a4 100755
(executable)
--- a/
tests/command/split-file.sh
+++ b/
tests/command/split-file.sh
@@
-17,9
+17,16
@@
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
+LANG=C
+export LANG
+
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
cd /
rm -rf $TEMPDIR
}
@@
-78,33
+85,37
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $PSPP -o
raw-ascii
$TEMPDIR/split.stat
+$SUPERVISOR $PSPP -o
pspp.csv
$TEMPDIR/split.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - <<EOF
-Variable Value Label
-X 1
-X Y
-- -
-1 2
-1 6
-1 7
-1 9
-1 5
-1 4
-Variable Value Label
-X 2
-X Y
-- -
-2 7
-2 0
-2 6
-2 5
-2 8
-2 9
-2 4
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Title: Test SPLIT FILE utility
+
+Variable,Value,Label
+X,1,
+
+Table: Data List
+X,Y
+1,2
+1,6
+1,7
+1,9
+1,5
+1,4
+
+Variable,Value,Label
+X,2,
+
+Table: Data List
+X,Y
+2,7
+2,0
+2,6
+2,5
+2,8
+2,9
+2,4
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi