Re: [bug #18982] Three check failures on x86-64

[Ben Pfaff]

John Darrington <address@hidden> writes:

> Btw, It's a bit annoying that I have to do "export PERL=perl" in order to run
> individual tests from a shell.

I'm not sure it makes sense to run individual tests from the
shell.  I run individual tests with "make check
TESTS=tests/subdir/name.sh".  It's not much harder than typing
the test name by itself.

Then again it's easy to fix.  Here's a patch for your review.

Index: merge/tests/bugs/big-input-2.sh
===================================================================
--- merge.orig/tests/bugs/big-input-2.sh        2007-08-09 19:49:02.000000000 
-0700
+++ merge/tests/bugs/big-input-2.sh     2007-08-09 19:49:53.000000000 -0700
@@ -7,6 +7,7 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 TESTFILE=$TEMPDIR/`basename $0`.sps
+: ${PERL:=perl}
 
 # ensure that top_builddir  are absolute
 if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
Index: merge/tests/command/sort.sh
===================================================================
--- merge.orig/tests/command/sort.sh    2007-08-09 19:49:31.000000000 -0700
+++ merge/tests/command/sort.sh 2007-08-09 19:50:51.000000000 -0700
@@ -4,6 +4,7 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
+: ${PERL:=perl}
 
 # ensure that top_builddir  are absolute
 if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
Index: merge/tests/formats/bcd-in.sh
===================================================================
--- merge.orig/tests/formats/bcd-in.sh  2007-08-09 19:49:31.000000000 -0700
+++ merge/tests/formats/bcd-in.sh       2007-08-09 19:50:51.000000000 -0700
@@ -7,6 +7,7 @@ if [ -z "$top_builddir" ] ; then top_bui
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
 PSPP=$top_builddir/src/ui/terminal/pspp
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
Index: merge/tests/formats/date-in.sh
===================================================================
--- merge.orig/tests/formats/date-in.sh 2007-08-09 19:49:31.000000000 -0700
+++ merge/tests/formats/date-in.sh      2007-08-09 19:50:51.000000000 -0700
@@ -9,6 +9,7 @@ if [ -z "$top_builddir" ] ; then top_bui
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
 PSPP=$top_builddir/src/ui/terminal/pspp
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
Index: merge/tests/formats/ib-in.sh
===================================================================
--- merge.orig/tests/formats/ib-in.sh   2007-08-09 19:49:31.000000000 -0700
+++ merge/tests/formats/ib-in.sh        2007-08-09 19:50:51.000000000 -0700
@@ -7,6 +7,7 @@ if [ -z "$top_builddir" ] ; then top_bui
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
 PSPP=$top_builddir/src/ui/terminal/pspp
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
Index: merge/tests/formats/legacy-in.sh
===================================================================
--- merge.orig/tests/formats/legacy-in.sh       2007-08-09 19:49:31.000000000 
-0700
+++ merge/tests/formats/legacy-in.sh    2007-08-09 19:50:51.000000000 -0700
@@ -7,6 +7,7 @@ if [ -z "$top_builddir" ] ; then top_bui
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
 PSPP=$top_builddir/src/ui/terminal/pspp
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
Index: merge/tests/formats/num-in.sh
===================================================================
--- merge.orig/tests/formats/num-in.sh  2007-08-09 19:49:31.000000000 -0700
+++ merge/tests/formats/num-in.sh       2007-08-09 19:50:51.000000000 -0700
@@ -9,6 +9,7 @@ if [ -z "$top_builddir" ] ; then top_bui
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
 PSPP=$top_builddir/src/ui/terminal/pspp
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
Index: merge/tests/formats/num-out.sh
===================================================================
--- merge.orig/tests/formats/num-out.sh 2007-08-09 19:49:31.000000000 -0700
+++ merge/tests/formats/num-out.sh      2007-08-09 19:50:51.000000000 -0700
@@ -9,6 +9,7 @@ if [ -z "$top_builddir" ] ; then top_bui
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
 PSPP=$top_builddir/src/ui/terminal/pspp
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
Index: merge/tests/formats/time-in.sh
===================================================================
--- merge.orig/tests/formats/time-in.sh 2007-08-09 19:49:31.000000000 -0700
+++ merge/tests/formats/time-in.sh      2007-08-09 19:50:51.000000000 -0700
@@ -9,6 +9,7 @@ if [ -z "$top_builddir" ] ; then top_bui
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
 PSPP=$top_builddir/src/ui/terminal/pspp
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`

-- 
Ben Pfaff 
http://benpfaff.org