projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced busted sed substitution with functioning perl substitutions
[pspp-builds.git]
/
tests
/
command
/
import-export.sh
diff --git
a/tests/command/import-export.sh
b/tests/command/import-export.sh
index 3cf262a442368415f81bd998fb7e49fe39c274a5..74a27543401bf6e61c24865ef530aedf6f512006 100755
(executable)
--- a/
tests/command/import-export.sh
+++ b/
tests/command/import-export.sh
@@
-3,17
+3,20
@@
# This program tests the IMPORT and EXPORT commands
TEMPDIR=/tmp/pspp-tst-$$
# This program tests the IMPORT and EXPORT commands
TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
here=`pwd`;
# ensure that top_srcdir is absolute
cd $top_srcdir; top_srcdir=`pwd`
here=`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()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-46,8
+49,8
@@
mkdir -p $TEMPDIR
cd $TEMPDIR
activity="create program"
cd $TEMPDIR
activity="create program"
-cat > $TE
MPDIR/prog.stat
<<EOF
-DATA LIST LIST
/x * y *
.
+cat > $TE
STFILE
<<EOF
+DATA LIST LIST
NOTABLE /X Y
.
BEGIN DATA.
1 2
3 4
BEGIN DATA.
1 2
3 4
@@
-55,9
+58,6
@@
BEGIN DATA.
END DATA.
EXPORT /OUTFILE='wiz.por'.
END DATA.
EXPORT /OUTFILE='wiz.por'.
-
-LIST.
-
IMPORT /FILE='wiz.por'.
LIST.
IMPORT /FILE='wiz.por'.
LIST.
@@
-66,31
+66,16
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TE
MPDIR/prog.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TE
STFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|X |F8.0 |
-|Y |F8.0 |
-+--------+------+
-
+diff -b -B $TEMPDIR/pspp.list - << EOF
X Y
-------- --------
1.00 2.00
3.00 4.00
5.00 6.00
X Y
-------- --------
1.00 2.00
3.00 4.00
5.00 6.00
-
- X Y
--------- --------
- 1.00 2.00
- 3.00 4.00
- 5.00 6.00
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi