diff options
| author | Yitzchak Scott-Thoennes <sthoenna@efn.org> | 2007-01-07 08:56:28 -0800 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2007-01-08 07:19:02 +0000 |
| commit | 2d4c99b6ea67fa79bdee6f202f54e253766058e2 (patch) | |
| tree | 5e2d8fcc7d9cb2477b0a6a23d8e851db77d967ea | |
| parent | 584ba4d5a2c5892744e31d4dc44d2eeeddf5030f (diff) | |
| download | perl-2d4c99b6ea67fa79bdee6f202f54e253766058e2.tar.gz | |
help cygwin find its dlls even on taint tests with no path
From: "Yitzchak Scott-Thoennes" <sthoenna@efn.org>
Message-ID: <2437.63.226.247.31.1168217788.squirrel@63.226.247.31>
p4raw-id: //depot/perl@29713
| -rw-r--r-- | cygwin/Makefile.SHs | 8 | ||||
| -rwxr-xr-x | t/op/taint.t | 16 |
2 files changed, 8 insertions, 16 deletions
diff --git a/cygwin/Makefile.SHs b/cygwin/Makefile.SHs index dee49c006c..90f201d717 100644 --- a/cygwin/Makefile.SHs +++ b/cygwin/Makefile.SHs @@ -206,4 +206,12 @@ distdir: miniperl ./miniperl '-MExtUtils::Manifest' \ -e "ExtUtils::Manifest::manicopy(ExtUtils::Manifest::maniread(),'$(DIST_DIRECTORY)')" +cygwin1.dll: /bin/cygwin1.dll + cp /bin/cygwin1.dll . + +cygcrypt-0.dll: /bin/cygcrypt-0.dll + cp /bin/cygcrypt-0.dll . + +test_prep: cygwin1.dll cygcrypt-0.dll + !NO!SUBS! diff --git a/t/op/taint.t b/t/op/taint.t index 533733276a..ec7c498171 100755 --- a/t/op/taint.t +++ b/t/op/taint.t @@ -155,22 +155,6 @@ my $TEST = catfile(curdir(), 'TEST'); delete @ENV{@MoreEnv}; $ENV{TERM} = 'dumb'; - if ($Is_Cygwin && ! -f 'cygwin1.dll') { - system("/usr/bin/cp /usr/bin/cygwin1.dll .") && - die "$0: failed to cp cygwin1.dll: $!\n"; - eval q{ - END { unlink "cygwin1.dll" } - }; - } - - if ($Is_Cygwin && ! -f 'cygcrypt-0.dll' && -f '/usr/bin/cygcrypt-0.dll') { - system("/usr/bin/cp /usr/bin/cygcrypt-0.dll .") && - die "$0: failed to cp cygcrypt-0.dll: $!\n"; - eval q{ - END { unlink "cygcrypt-0.dll" } - }; - } - test eval { `$echo 1` } eq "1\n"; SKIP: { |