From: Yitzchak Scott-Thoennes <sthoenna@efn.org>
Date: Sun, 7 Jan 2007 16:56:28 +0000 (-0800)
Subject: help cygwin find its dlls even on taint tests with no path
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2d4c99b6ea67fa79bdee6f202f54e253766058e2;p=p5sagit%2Fp5-mst-13.2.git

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
---

diff --git a/cygwin/Makefile.SHs b/cygwin/Makefile.SHs
index dee49c0..90f201d 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 5337332..ec7c498 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: {