Avert crashes when testing in parallel.

Both t/001-basic.t and what was t/004-nolinenumbers.t were trying to write to
a 't/XSTest.c' file.  When run in parallel, this was causing problems when
TEST_JOBS >= 1 (2 on some boxes, 4 on dromedary).

Since all that t/004-nolinenumbers.t was ever trying to do was to run
process_file() without line numbers -- a case not exercised prior to my
2009-11 refactoring/test additions -- the simplest way to avoid these
problems is to stuff the tests from t/004 into t/001 and delete t/001.

For: RT #119231

diff --git a/MANIFEST b/MANIFEST
index e37d10c..c3f1ec4 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -3037,7 +3037,6 @@ dist/ExtUtils-ParseXS/lib/perlxstypemap.pod                       Perl XS C/Perl type conversion too
 dist/ExtUtils-ParseXS/t/001-basic.t                            See if ExtUtils::ParseXS works
 dist/ExtUtils-ParseXS/t/002-more.t                             Extended ExtUtils::ParseXS testing
 dist/ExtUtils-ParseXS/t/003-usage.t                            ExtUtils::ParseXS tests
-dist/ExtUtils-ParseXS/t/004-nolinenumbers.t                    ExtUtils::ParseXS tests
 dist/ExtUtils-ParseXS/t/101-standard_typemap_locations.t       ExtUtils::ParseXS tests
 dist/ExtUtils-ParseXS/t/102-trim_whitespace.t                  ExtUtils::ParseXS tests
 dist/ExtUtils-ParseXS/t/103-tidy_type.t                                ExtUtils::ParseXS tests

diff --git a/dist/ExtUtils-ParseXS/t/001-basic.t b/dist/ExtUtils-ParseXS/t/001-basic.t
index a1b9f1d..a2d3c6b 100644 (file)
--- a/dist/ExtUtils-ParseXS/t/001-basic.t
+++ b/dist/ExtUtils-ParseXS/t/001-basic.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 use strict;
-use Test::More tests => 14;
+use Test::More tests => 24;
 use Config;
 use DynaLoader;
 use ExtUtils::CBuilder;
@@ -16,6 +16,7 @@ use Carp; $SIG{__WARN__} = \&Carp::cluck;
 
 #########################
 
+{ # first block: try without linenumbers
 my $pxs = ExtUtils::ParseXS->new;
 # Try sending to filehandle
 tie *FH, 'Foo';
@@ -121,7 +122,88 @@ unless ($ENV{PERL_NO_CLEANUP}) {
     1 while unlink $_;
   }
 }
+}
+
+#####################################################################
+
+{ # second block: try with linenumbers
+my $pxs = ExtUtils::ParseXS->new;
+# Try sending to filehandle
+tie *FH, 'Foo';
+$pxs->process_file(
+    filename => 'XSTest.xs',
+    output => \*FH,
+    prototypes => 1,
+    linenumbers => 0,
+);
+like tied(*FH)->content, '/is_even/', "Test that output contains some text";
+
+$source_file = 'XSTest.c';
+
+# Try sending to file
+$pxs->process_file(
+    filename => 'XSTest.xs',
+    output => $source_file,
+    prototypes => 0,
+    linenumbers => 0,
+);
+ok -e $source_file, "Create an output file";
+
+my $quiet = $ENV{PERL_CORE} && !$ENV{HARNESS_ACTIVE};
+my $b = ExtUtils::CBuilder->new(quiet => $quiet);
+
+SKIP: {
+  skip "no compiler available", 2
+    if ! $b->have_compiler;
+  $obj_file = $b->compile( source => $source_file );
+  ok $obj_file, "ExtUtils::CBuilder::compile() returned true value";
+  ok -e $obj_file, "Make sure $obj_file exists";
+}
 
+SKIP: {
+  skip "no dynamic loading", 5
+    if !$b->have_compiler || !$Config{usedl};
+  my $module = 'XSTest';
+  $lib_file = $b->link( objects => $obj_file, module_name => $module );
+  ok $lib_file, "ExtUtils::CBuilder::link() returned true value";
+  ok -e $lib_file,  "Make sure $lib_file exists";
+
+  eval {require XSTest};
+  is $@, '', "No error message recorded, as expected";
+  ok  XSTest::is_even(8),
+    "Function created thru XS returned expected true value";
+  ok !XSTest::is_even(9),
+    "Function created thru XS returned expected false value";
+
+  # Win32 needs to close the DLL before it can unlink it, but unfortunately
+  # dl_unload_file was missing on Win32 prior to perl change #24679!
+  if ($^O eq 'MSWin32' and defined &DynaLoader::dl_unload_file) {
+    for (my $i = 0; $i < @DynaLoader::dl_modules; $i++) {
+      if ($DynaLoader::dl_modules[$i] eq $module) {
+        DynaLoader::dl_unload_file($DynaLoader::dl_librefs[$i]);
+        last;
+      }
+    }
+  }
+}
+
+my $seen = 0;
+open my $IN, '<', $source_file
+  or die "Unable to open $source_file: $!";
+while (my $l = <$IN>) {
+  $seen++ if $l =~ m/#line\s1\s/;
+}
+close $IN or die "Unable to close $source_file: $!";
+is( $seen, 0, "No linenumbers created in output file, as intended" );
+
+
+unless ($ENV{PERL_NO_CLEANUP}) {
+  for ( $obj_file, $lib_file, $source_file) {
+    next unless defined $_;
+    1 while unlink $_;
+  }
+}
+}
 #####################################################################
 
 sub Foo::TIEHANDLE { bless {}, 'Foo' }

diff --git a/dist/ExtUtils-ParseXS/t/004-nolinenumbers.t b/dist/ExtUtils-ParseXS/t/004-nolinenumbers.t
deleted file mode 100644 (file)
index 7ecbd59..0000000
--- a/dist/ExtUtils-ParseXS/t/004-nolinenumbers.t
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use Test::More tests => 11;
-use Config;
-use DynaLoader;
-use ExtUtils::CBuilder;
-
-my ($source_file, $obj_file, $lib_file);
-
-require_ok( 'ExtUtils::ParseXS' );
-ExtUtils::ParseXS->import('process_file');
-
-chdir('t') if -d 't';
-
-use Carp; $SIG{__WARN__} = \&Carp::cluck;
-
-#########################
-
-# Try sending to filehandle
-tie *FH, 'Foo';
-process_file(
-    filename => 'XSTest.xs',
-    output => \*FH,
-    prototypes => 1,
-    linenumbers => 0,
-);
-like tied(*FH)->content, '/is_even/', "Test that output contains some text";
-
-$source_file = 'XSTest.c';
-
-# Try sending to file
-process_file(
-    filename => 'XSTest.xs',
-    output => $source_file,
-    prototypes => 0,
-    linenumbers => 0,
-);
-ok -e $source_file, "Create an output file";
-
-my $quiet = $ENV{PERL_CORE} && !$ENV{HARNESS_ACTIVE};
-my $b = ExtUtils::CBuilder->new(quiet => $quiet);
-
-SKIP: {
-  skip "no compiler available", 2
-    if ! $b->have_compiler;
-  $obj_file = $b->compile( source => $source_file );
-  ok $obj_file, "ExtUtils::CBuilder::compile() returned true value";
-  ok -e $obj_file, "Make sure $obj_file exists";
-}
-
-SKIP: {
-  skip "no dynamic loading", 5
-    if !$b->have_compiler || !$Config{usedl};
-  my $module = 'XSTest';
-  $lib_file = $b->link( objects => $obj_file, module_name => $module );
-  ok $lib_file, "ExtUtils::CBuilder::link() returned true value";
-  ok -e $lib_file,  "Make sure $lib_file exists";
-
-  eval {require XSTest};
-  is $@, '', "No error message recorded, as expected";
-  ok  XSTest::is_even(8),
-    "Function created thru XS returned expected true value";
-  ok !XSTest::is_even(9),
-    "Function created thru XS returned expected false value";
-
-  # Win32 needs to close the DLL before it can unlink it, but unfortunately
-  # dl_unload_file was missing on Win32 prior to perl change #24679!
-  if ($^O eq 'MSWin32' and defined &DynaLoader::dl_unload_file) {
-    for (my $i = 0; $i < @DynaLoader::dl_modules; $i++) {
-      if ($DynaLoader::dl_modules[$i] eq $module) {
-        DynaLoader::dl_unload_file($DynaLoader::dl_librefs[$i]);
-        last;
-      }
-    }
-  }
-}
-
-my $seen = 0;
-open my $IN, '<', $source_file
-  or die "Unable to open $source_file: $!";
-while (my $l = <$IN>) {
-  $seen++ if $l =~ m/#line\s1\s/;
-}
-close $IN or die "Unable to close $source_file: $!";
-is( $seen, 0, "No linenumbers created in output file, as intended" ); 
-
-
-unless ($ENV{PERL_NO_CLEANUP}) {
-  for ( $obj_file, $lib_file, $source_file) {
-    next unless defined $_;
-    1 while unlink $_;
-  }
-}
-
-#####################################################################
-
-sub Foo::TIEHANDLE { bless {}, 'Foo' }
-sub Foo::PRINT { shift->{buf} .= join '', @_ }
-sub Foo::content { shift->{buf} }