diff options
| author | David Mitchell <davem@iabyn.com> | 2015-06-18 17:51:40 +0100 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2015-06-18 18:15:30 +0100 |
| commit | 1a74a75d15cf728f25463c9ddb257634fa022be7 (patch) | |
| tree | 126049818a72aa07922dcd1363219490a799d324 | |
| parent | 047c3ca7cc8e88b74f0fd245fe08c210d4084fa4 (diff) | |
| download | perl-1a74a75d15cf728f25463c9ddb257634fa022be7.tar.gz | |
autodie/t/mkdir.t: escape build dir path
This test file creates a regex which includes the path of the build
directory. If that path includes regex metachars (e.g. blead_g++_quick)
then the test fails. Easily fixed with \Q...\E.
Monkey-patching here rather than waiting for upstream, since this is
currently breaking blead g++ smokes.
| -rwxr-xr-x | Porting/Maintainers.pl | 2 | ||||
| -rw-r--r-- | cpan/autodie/t/mkdir.t | 4 | ||||
| -rw-r--r-- | t/porting/customized.dat | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 87c403fad6..ac1e3c2cf4 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -156,6 +156,8 @@ use File::Glob qw(:case); t/system.t ) ], + # CPAN RT 105344 + 'CUSTOMIZED' => [ qw[ t/mkdir.t ] ], }, 'AutoLoader' => { diff --git a/cpan/autodie/t/mkdir.t b/cpan/autodie/t/mkdir.t index a5586bed34..3606f7e170 100644 --- a/cpan/autodie/t/mkdir.t +++ b/cpan/autodie/t/mkdir.t @@ -3,8 +3,8 @@ use strict; use Test::More; use FindBin qw($Bin); use constant TMPDIR => "$Bin/mkdir_test_delete_me"; -use constant ERROR_REGEXP => qr{Can't mkdir\('${\(TMPDIR)}', 0777\):}; -use constant SINGLE_DIGIT_ERROR_REGEXP => qr{Can't mkdir\('${\(TMPDIR)}', 0010\):}; +use constant ERROR_REGEXP => qr{Can't mkdir\('\Q${\(TMPDIR)}\E', 0777\):}; +use constant SINGLE_DIGIT_ERROR_REGEXP => qr{Can't mkdir\('\Q${\(TMPDIR)}\E', 0010\):}; # Delete our directory if it's there rmdir TMPDIR; diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 2bb49b12f1..9e0bd1c9de 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -49,6 +49,7 @@ Win32API::File cpan/Win32API-File/Makefile.PL 605d0aee31aebe84a99408f9ab5f644db5 Win32API::File cpan/Win32API-File/t/file.t 124e64aa77e755235eb297644a87fac5388d3d78 Win32API::File cpan/Win32API-File/t/tie.t 712ea7edd0cc805ce1c0b8172c01b03dd19b583d Win32API::File cpan/Win32API-File/typemap 24bff088babeadac0873e8df390d1666d9d9db4a +autodie cpan/autodie/t/mkdir.t 9e70d2282a3cc7d76a78bf8144fccba20fb37dac podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69 version cpan/version/lib/version.pm d0923b895d57f1d669ae36fcf85c87b16db341d1 |