allow PERL_DISABLE_PMC to be defined from anywhere

I enable PERL_DISABLE_PMC in a .h, not in CCFLAGS. CCFLAGS on Unix
typically has no -Ds in it, build options go into config.h, not
Config.pm's CCFLAGS. This change allows PERL_DISABLE_PMC option to pass
tests regardless of where it is defined. cpan/parent/t/parent-pmc.t is not
fixed by this patch.

2 files changed, 17 insertions, 4 deletions

diff --git a/t/comp/require.t b/t/comp/require.t
index f817527495..ea569ad08f 100644
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -243,13 +243,18 @@ EOT
     require Config;
     die "Failed to load Config for some reason"
 	unless $Config::Config{version};
-    my $ccflags = $Config::Config{ccflags};
-    die "Failed to get ccflags for some reason" unless defined $ccflags;
 
     my $simple = ++$i;
     my $pmc_older = ++$i;
     my $pmc_dies = ++$i;
-    if ($ccflags =~ /(?:^|\s)-DPERL_DISABLE_PMC\b/) {
+    my $no_pmc;
+    foreach(Config::non_bincompat_options()) {
+	if($_ eq "PERL_DISABLE_PMC"){
+	    $no_pmc = 1;
+	    last;
+	}
+    }
+    if ($no_pmc) {
 	print "# .pmc files are ignored, so test that\n";
 	write_file_not_thing('krunch.pmc', '.pmc', $pmc_older);
 	write_file('urkkk.pm', qq(print "ok $simple - urkkk.pm branch A\n"));
diff --git a/t/run/switchM.t b/t/run/switchM.t
index 603d5c5fa0..d2b1d2d6ce 100644
--- a/t/run/switchM.t
+++ b/t/run/switchM.t
@@ -24,7 +24,15 @@ like(runperl(switches => ['-Irun/flib/', '-Mbroken'], stderr => 1),
      "Ensure -Irun/flib/ produces correct filename in warnings");
 
 SKIP: {
-    if ( $Config{ccflags} =~ /(?:^|\s)-DPERL_DISABLE_PMC\b/ ) {
+    my $no_pmc;
+    foreach(Config::non_bincompat_options()) {
+	if($_ eq "PERL_DISABLE_PMC"){
+	    $no_pmc = 1;
+	    last;
+	}
+    }
+
+    if ( $no_pmc ) {
         skip('Tests fail without PMC support', 2);
     }