projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Without HAVE_SYS_TYPES_H or HAVE_SYS_WAIT_H, in connect_debugger we
[pspp]
/
tests
/
command
/
import-export.sh
diff --git
a/tests/command/import-export.sh
b/tests/command/import-export.sh
index 41b8b13d78e6a8bde2b60a8a72ce7368866c50ef..8b88937f905972166a17c4cb2899c3036aea15ed 100755
(executable)
--- a/
tests/command/import-export.sh
+++ b/
tests/command/import-export.sh
@@
-5,10
+5,14
@@
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`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-16,6
+20,7
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-49,7
+54,7
@@
cd $TEMPDIR
activity="create program"
cat > $TESTFILE <<EOF
activity="create program"
cat > $TESTFILE <<EOF
-DATA LIST LIST
/X * Y *
.
+DATA LIST LIST
NOTABLE /X Y
.
BEGIN DATA.
1 2
3 4
BEGIN DATA.
1 2
3 4
@@
-57,9
+62,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.
@@
-68,31
+70,17
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; 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|
-#========#======#
-|X |F8.0 |
-|Y |F8.0 |
-+--------+------+
-
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -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