projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't destroy dictionary on error if we didn't create it.
[pspp]
/
tests
/
bugs
/
recode-copy-bug.sh
diff --git
a/tests/bugs/recode-copy-bug.sh
b/tests/bugs/recode-copy-bug.sh
index 94d926428a238f06f4ebf9225bf397a65f57fe9d..912590a34c0869d6260a107a5483f4002c7f0167 100755
(executable)
--- a/
tests/bugs/recode-copy-bug.sh
+++ b/
tests/bugs/recode-copy-bug.sh
@@
-3,17
+3,28
@@
# This program tests ....
TEMPDIR=/tmp/pspp-tst-$$
# This program tests ....
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`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-42,34
+53,39
@@
pass()
}
mkdir -p $TEMPDIR
}
mkdir -p $TEMPDIR
+
+activity="copy template 1"
cp $top_srcdir/tests/bugs/recode-copy-bug-1.stat $TEMPDIR
cp $top_srcdir/tests/bugs/recode-copy-bug-1.stat $TEMPDIR
-cp $top_srcdir/tests/bugs/recode-copy-bug-2.stat $TEMPDIR
-cd $TEMPDIR
+if [ $? -ne 0 ] ; then no_result ; fi
+activity="copy template 2"
+cp $top_srcdir/tests/bugs/recode-copy-bug-2.stat $TEMPDIR
+if [ $? -ne 0 ] ; then no_result ; fi
+activity="chdir"
+cd $TEMPDIR
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-activity="run program"
-$SUPERVISOR $
top_srcdir/src/pspp -o raw-ascii
$TEMPDIR/recode-copy-bug-1.stat
+activity="run program
1
"
+$SUPERVISOR $
PSPP --testing-mode
$TEMPDIR/recode-copy-bug-1.stat
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-activity="compare output"
-
diff -b -B -w
$TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
-
+activity="compare output
1
"
+
perl -pi -e 's/^\s*$//g'
$TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
+diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
if [ $? -ne 0 ] ; then fail ; fi
if [ $? -ne 0 ] ; then fail ; fi
-activity="run program"
-$SUPERVISOR $
top_srcdir/src/pspp -o raw-ascii
$TEMPDIR/recode-copy-bug-2.stat
+activity="run program
2
"
+$SUPERVISOR $
PSPP --testing-mode
$TEMPDIR/recode-copy-bug-2.stat
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-activity="compare output"
-
diff -b -B -w
$TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
-
+activity="compare output
2
"
+
perl -pi -e 's/^\s*$//g'
$TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
+diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
if [ $? -ne 0 ] ; then fail ; fi
if [ $? -ne 0 ] ; then fail ; fi
-
pass;
pass;