Update scripts that invoke Perl to invoke it as simply "perl" if

not run from the PSPP Makefiles.  Patch #6169.  Thanks to John
Darrington for suggestion and review.
* bugs/big-input-2.sh: Make $PERL default to perl.
* command/sort.sh: Ditto.
* formats/bcd-in.sh: Ditto.
* formats/date-in.sh: Ditto.
* formats/ib-in.sh: Ditto.
* formats/legacy-in.sh: Ditto.
* formats/num-in.sh: Ditto.
* formats/num-out.sh: Ditto.
* formats/time-in.sh: Ditto.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a51e779e19048249b06f8da209d12fb0c9a97ec4..8d8e67c5366f7ba628f75cff15df39540a8e9f21 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,18 @@
+2007-09-04  Ben Pfaff  <blp@gnu.org>
+
+       Update scripts that invoke Perl to invoke it as simply "perl" if
+       not run from the PSPP Makefiles.  Patch #6169.  Thanks to John
+       Darrington for suggestion and review.
+       * bugs/big-input-2.sh: Make $PERL default to perl.
+       * command/sort.sh: Ditto.
+       * formats/bcd-in.sh: Ditto.
+       * formats/date-in.sh: Ditto.
+       * formats/ib-in.sh: Ditto.
+       * formats/legacy-in.sh: Ditto.
+       * formats/num-in.sh: Ditto.
+       * formats/num-out.sh: Ditto.
+       * formats/time-in.sh: Ditto.
+
 2007-08-26  Ben Pfaff  <blp@gnu.org>
 
        * Updated most invocations of PSPP in the tests to use

diff --git a/tests/bugs/big-input-2.sh b/tests/bugs/big-input-2.sh
index 087e63a6f5c2b4a0f000df9e5e2db89dab573756..ecc0946868d6114c39ce0d3b02d89e3d26245ae1 100755 (executable)
--- a/tests/bugs/big-input-2.sh
+++ b/tests/bugs/big-input-2.sh
@@ -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

diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index 00d4f403c314ba439e9cbe21bb3cf69d7d41eff0..c3c96a35456b56d76db8bf76b9e6067cdf6e8867 100755 (executable)
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -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

diff --git a/tests/formats/bcd-in.sh b/tests/formats/bcd-in.sh
index aaa0a8d9ef5827b346ebff193ea3f2d0a5f9cc05..f93adeafeead61b06e73ef78c03969b407529c13 100755 (executable)
--- a/tests/formats/bcd-in.sh
+++ b/tests/formats/bcd-in.sh
@@ -7,6 +7,7 @@ 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
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`

diff --git a/tests/formats/date-in.sh b/tests/formats/date-in.sh
index 67fe5799e4bf9fa57a79388e50bda31ec974a3b3..edadc3f5b8e184fa1fa28401f7b2359724bad4d2 100755 (executable)
--- a/tests/formats/date-in.sh
+++ b/tests/formats/date-in.sh
@@ -9,6 +9,7 @@ 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
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`

diff --git a/tests/formats/ib-in.sh b/tests/formats/ib-in.sh
index e52bf7d17dedef178ae2edcb95d1602d6faec119..0519d27d495d1879b3c0b100d68ea5cfa0b02f28 100755 (executable)
--- a/tests/formats/ib-in.sh
+++ b/tests/formats/ib-in.sh
@@ -7,6 +7,7 @@ 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
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`

diff --git a/tests/formats/legacy-in.sh b/tests/formats/legacy-in.sh
index f678356a766a467dc92258194a80400087d13e2e..cfb5f47ef04a6bffec9d126f68bd459a0d18c6af 100755 (executable)
--- a/tests/formats/legacy-in.sh
+++ b/tests/formats/legacy-in.sh
@@ -7,6 +7,7 @@ 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
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`

diff --git a/tests/formats/num-in.sh b/tests/formats/num-in.sh
index e58af7588fb08134218e01baac253560f327e25e..b61019f370a57e782d05cfc352b2e6c0b363f139 100755 (executable)
--- a/tests/formats/num-in.sh
+++ b/tests/formats/num-in.sh
@@ -9,6 +9,7 @@ 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
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`

diff --git a/tests/formats/num-out.sh b/tests/formats/num-out.sh
index 37b0d2eb16bc287baa1c66931347feec26b11699..cf4185aea3f453b86688908b9f1181337bb16f44 100755 (executable)
--- a/tests/formats/num-out.sh
+++ b/tests/formats/num-out.sh
@@ -9,6 +9,7 @@ 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
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`

diff --git a/tests/formats/time-in.sh b/tests/formats/time-in.sh
index b842e74bd6a72d90a20a68006d756848d878b13e..69d7b84d7a165c7a4975b22ccb65a4ecfb95c48d 100755 (executable)
--- a/tests/formats/time-in.sh
+++ b/tests/formats/time-in.sh
@@ -9,6 +9,7 @@ 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
+: ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`