From cd4f5bfade86b443d1ec355c2dd8be205846b32f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 5 Sep 2007 04:56:15 +0000 Subject: [PATCH] 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. --- tests/ChangeLog | 15 +++++++++++++++ tests/bugs/big-input-2.sh | 1 + tests/command/sort.sh | 1 + tests/formats/bcd-in.sh | 1 + tests/formats/date-in.sh | 1 + tests/formats/ib-in.sh | 1 + tests/formats/legacy-in.sh | 1 + tests/formats/num-in.sh | 1 + tests/formats/num-out.sh | 1 + tests/formats/time-in.sh | 1 + 10 files changed, 24 insertions(+) diff --git a/tests/ChangeLog b/tests/ChangeLog index a51e779e19..8d8e67c536 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,18 @@ +2007-09-04 Ben Pfaff + + 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 * 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 087e63a6f5..ecc0946868 100755 --- 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 00d4f403c3..c3c96a3545 100755 --- 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 aaa0a8d9ef..f93adeafee 100755 --- 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 67fe5799e4..edadc3f5b8 100755 --- 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 e52bf7d17d..0519d27d49 100755 --- 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 f678356a76..cfb5f47ef0 100755 --- 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 e58af7588f..b61019f370 100755 --- 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 37b0d2eb16..cf4185aea3 100755 --- 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 b842e74bd6..69d7b84d7a 100755 --- 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` -- 2.30.2