diff options
| author | Tony Cook <tony@develop-help.com> | 2014-12-09 15:06:05 +1100 |
|---|---|---|
| committer | Tony Cook <tony@develop-help.com> | 2015-01-06 09:30:32 +1100 |
| commit | a64c093f81b2020087bd2a8ccb9f74a862ec194f (patch) | |
| tree | dd444bf3bfccb3e7111b903a2816341e96cd8a18 /t/run | |
| parent | 1eea96ba8514738ce13016110ff0c48d06bc862f (diff) | |
| download | perl-a64c093f81b2020087bd2a8ccb9f74a862ec194f.tar.gz | |
minitest: miniperl on win32 always displays the x86 arch, so skip testing it
Diffstat (limited to 't/run')
| -rw-r--r-- | t/run/switches.t | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/t/run/switches.t b/t/run/switches.t index 09b77c7d7e..78915e0175 100644 --- a/t/run/switches.t +++ b/t/run/switches.t @@ -298,13 +298,17 @@ is runperl(stderr => 1, prog => '#!perl -M'), local $TODO = ''; # these ones should work on VMS # there are definitely known build configs where this test will fail # DG/UX comes to mind. Maybe we should remove these special cases? - my $v = sprintf "%vd", $^V; - my $ver = $Config{PERL_VERSION}; - my $rel = $Config{PERL_SUBVERSION}; - like( runperl( switches => ['-v'] ), - qr/This is perl 5, version \Q$ver\E, subversion \Q$rel\E \(v\Q$v\E(?:[-*\w]+| \([^)]+\))?\) built for \Q$Config{archname}\E.+Copyright.+Larry Wall.+Artistic License.+GNU General Public License/s, - '-v looks okay' ); - + SKIP: + { + skip "Win32 miniperl produces a default archname in -v", 1 + if $^O eq 'MSWin32' && is_miniperl; + my $v = sprintf "%vd", $^V; + my $ver = $Config{PERL_VERSION}; + my $rel = $Config{PERL_SUBVERSION}; + like( runperl( switches => ['-v'] ), + qr/This is perl 5, version \Q$ver\E, subversion \Q$rel\E \(v\Q$v\E(?:[-*\w]+| \([^)]+\))?\) built for \Q$Config{archname}\E.+Copyright.+Larry Wall.+Artistic License.+GNU General Public License/s, + '-v looks okay' ); + } } # Tests for -h |