[perl.git] branch blead, updated. v5.19.11-9-gd9c544b

[Tony Cook]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/d9c544bf81d27bebeecc8eb1204005c1cc329f64?hp=6a807e2131bdd208d856c632a661bea960643322>

- Log -----------------------------------------------------------------
commit d9c544bf81d27bebeecc8eb1204005c1cc329f64
Author: Tom Hukins <t...@eborcom.com>
Date:   Mon Apr 14 18:38:46 2014 +0100

    Make the test suite pass with -DPERL_DISABLE_PMC
    
    Commit 9fdd5a7ac74817cfaab6 introduced new tests that fail when building
    perl without PMC support.  In such cases, skip these new tests.

M       t/run/switchM.t

commit 2a07cc4f0ca093da65a23fd9dda1fdeafb0e917f
Author: Craig A. Berry <craigbe...@mac.com>
Date:   Tue Apr 15 19:30:26 2014 -0500

    Avoid double quotes in switchM.t runperl args.
    
    The new tests added in 9fdd5a7ac74817 were sending runperl a -e
    command with double quotes around it, which confuses matters on
    VMS where arguments get double quotes added unless they already
    have them.  The solution is simple: just use the 'prog' parameter
    to runperl and let runperl handle the quoting.

M       t/run/switchM.t
-----------------------------------------------------------------------

Summary of changes:
 t/run/switchM.t |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/t/run/switchM.t b/t/run/switchM.t
index 6a75100..9c12a4a 100644
--- a/t/run/switchM.t
+++ b/t/run/switchM.t
@@ -3,6 +3,9 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
+    require Config;
+    import Config;
+
 }
 use strict;
 
@@ -18,10 +21,16 @@ like(runperl(switches => ['-Irun/flib/', '-Mbroken'], 
stderr => 1),
      qr/^Global symbol "\$x" requires explicit package name at 
run\/flib\/broken.pm line 6\./,
      "Ensure -Irun/flib/ produces correct filename in warnings");
 
-like(runperl(switches => ['-Irun/flib', '-Mt2', '-e "print t2::id()"'], stderr 
=> 1),
-     qr/^t2pmc$/,
-     "Ensure -Irun/flib loads pmc");
+SKIP: {
+    if ( $Config{ccflags} =~ /-DPERL_DISABLE_PMC/ ) {
+        skip('Tests fail without PMC support', 2);
+    }
+
+    like(runperl(switches => ['-Irun/flib', '-Mt2'], prog => 'print t2::id()', 
stderr => 1),
+         qr/^t2pmc$/,
+         "Ensure -Irun/flib loads pmc");
 
-like(runperl(switches => ['-Irun/flib/', '-Mt2', '-e "print t2::id()"'], 
stderr => 1),
-     qr/^t2pmc$/,
-     "Ensure -Irun/flib/ loads pmc");
+    like(runperl(switches => ['-Irun/flib/', '-Mt2'], prog => 'print 
t2::id()', stderr => 1),
+         qr/^t2pmc$/,
+         "Ensure -Irun/flib/ loads pmc");
+}

--
Perl5 Master Repository