X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fh2xs.t;h=380f838c911c24a1756739fbcc1e0f12264157f2;hb=dfa4e5d386dd8c5329351699b02085856cdd140e;hp=2a5e14b66d53d52a9e0f08eed24d7c37c35b0049;hpb=4a6602376e46f7ce9ede73b10063d105a533f05a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/h2xs.t b/lib/h2xs.t
index 2a5e14b..380f838 100644
--- a/lib/h2xs.t
+++ b/lib/h2xs.t
@@ -12,6 +12,12 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
+    # FIXME (or rather FIXh2xs)
+    require Config;
+    if (($Config::Config{'extensions'} !~ m!\bDevel/PPPort\b!) ){
+	print "1..0 # Skip -- Perl configured without Devel::PPPort module\n";
+	exit 0;
+    }
 }
 
 # use strict; # we are not really testing this
@@ -50,6 +56,10 @@ if ($^O eq 'MacOS') {
 my $name = 'h2xst';
 my $header = "$name.h";
 my $thisversion = sprintf "%vd", $^V;
+$thisversion =~ s/^v//;
+
+# If this test has failed previously a copy may be left.
+rmtree($name);
 
 my @tests = (
 "-f -n $name", $], <<"EOXSFILES",
@@ -117,7 +127,7 @@ Writing $name/Changes
 Writing $name/MANIFEST
 EONOXSFILES
 
-"-f -n $name $header -b $thisversion", $], <<"EOXSFILES",
+"-f -n $name -b $thisversion $header", $], <<"EOXSFILES",
 Writing $name/ppport.h
 Writing $name/lib/$name.pm
 Writing $name/$name.xs