To: Richard Dawe <rich AT phekda DOT freeserve DOT co DOT uk>
Cc: djgpp-workers AT delorie DOT com
Subject: Re: Fetish.pm band-aid (Fileutils testsuite)
References: <Pine DOT SUN DOT 3 DOT 91 DOT 1010306105723 DOT 7922J-100000 AT is>
	<3AB4B541 DOT 2E8B3692 AT phekda DOT freeserve DOT co DOT uk>
In-Reply-To: <3AB4B541.2E8B3692@phekda.freeserve.co.uk> (Richard Dawe's message of "Sun, 18 Mar 2001 13:16:49 +0000")
From: Jim Meyering <jim AT meyering DOT net>
Date: 18 Mar 2001 17:57:56 +0100
Message-ID: <uryr8zvauaz.fsf@ixi.eng.ascend.com>
Lines: 53
User-Agent: Gnus/5.090001 (Oort Gnus v0.01) Emacs/21.0.101
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: Jim Meyering <meyering AT ascend DOT com>
Reply-To: djgpp-workers AT delorie DOT com

Thanks!
I've done (essentially) as you suggest.
Here's the change I've made:

Index: tests/Fetish.pm
===================================================================
RCS file: /fetish/fileutils/tests/Fetish.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tests/Fetish.pm	2000/11/26 23:04:39	1.9
+++ tests/Fetish.pm	2001/03/18 16:53:58	1.10
@@ -22,6 +22,12 @@
 my %Zero_one_type = map {$_ => 1} qw (OUT ERR EXIT PRE POST);
 my $srcdir = $ENV{srcdir};
 my $Global_count = 1;
+
+# When running in a DJGPP environment, make $ENV{SHELL} point to bash.
+# Otherwise, a bad shell might be used (e.g. command.com) and many
+# tests would fail.
+defined $ENV{DJDIR}
+  and $ENV{SHELL} = "$ENV{DJDIR}/bin/bash.exe";
 
 # A file spec: a scalar or a reference to a single-keyed hash
 # ================

Richard Dawe <rich AT phekda DOT freeserve DOT co DOT uk> wrote:
...
| In the meantime, below is a diff to provide the local solution suggested
| by Eli.
|
| Thanks, bye, Rich =]
|
| *** orig/fileutils-4.0/tests/Fetish.pm  Sat Oct 17 14:47:22 1998
| --- gnu.dev/filutil4.0/tests/Fetish.pm  Sun Mar 18 13:12:56 2001
| ***************
| *** 23,28 ****
| --- 23,35 ----
|   my $srcdir = $ENV{srcdir};
|   my $Global_count = 1;
|
| + # (richdawe AT bigfoot DOT com): If we're running in a DJGPP environment, set
| up
| + # $ENV{'SHELL'} to point to bash. If we don't do this, a bad shell might
| + # be used (e.g. command.com) and the tests will just fail.
| + if (defined($ENV{'DJDIR'})) {
| +     $ENV{'SHELL'} = $ENV{'DJDIR'}.'/bin/bash.exe';
| + }
| +
|   # A file spec: a scalar or a reference to a single-keyed hash
|   # ================
|   # 'contents'               contents only (file name is derived from test
| name)