svn commit: r615416 - in /spamassassin/trunk/build/hudson: run_build tap-to-junit-xml

[jm...@apache.org]

Author: jm
Date: Fri Jan 25 16:52:26 2008
New Revision: 615416

URL: http://svn.apache.org/viewvc?rev=615416&view=rev
Log:
try to keep disttest and p561 results separate

Modified:
    spamassassin/trunk/build/hudson/run_build
    spamassassin/trunk/build/hudson/tap-to-junit-xml

Modified: spamassassin/trunk/build/hudson/run_build
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/hudson/run_build?rev=615416&r1=615415&r2=615416&view=diff
==============================================================================
--- spamassassin/trunk/build/hudson/run_build (original)
+++ spamassassin/trunk/build/hudson/run_build Fri Jan 25 16:52:26 2008
@@ -31,9 +31,9 @@
 
 # generate XML test reports
 perl ./build/hudson/tap-to-junit-xml \
-    testxml/make_test < artifacts/make_test.log
+    "make test" testxml/make_test < artifacts/make_test.log
 perl ./build/hudson/tap-to-junit-xml \
-    testxml/make_disttest < artifacts/make_disttest.log
+    "make disttest" testxml/make_disttest < artifacts/make_disttest.log
 perl ./build/hudson/tap-to-junit-xml \
-    testxml/make_test_p561 < artifacts/make_test_p561.log
+    "make test p561" testxml/make_test_p561 < artifacts/make_test_p561.log
 

Modified: spamassassin/trunk/build/hudson/tap-to-junit-xml
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/hudson/tap-to-junit-xml?rev=615416&r1=615415&r2=615416&view=diff
==============================================================================
--- spamassassin/trunk/build/hudson/tap-to-junit-xml (original)
+++ spamassassin/trunk/build/hudson/tap-to-junit-xml Fri Jan 25 16:52:26 2008
@@ -3,6 +3,7 @@
 use strict;
 use warnings;
 
+my $opt_suitename = shift @ARGV;
 my $opt_multifile = 0;
 my $opt_mfprefix;
 
@@ -15,7 +16,7 @@
 use Time::HiRes qw(gettimeofday tv_interval);
 use XML::Generator qw(:noimport);
 
-my $suite_name = 'make test';
+my $suite_name = $opt_suitename || 'make test';
 
 my $tout = join("", <STDIN>);
 my $tap     = TAP::Parser->new( { tap => $tout } );
@@ -117,10 +118,10 @@
       $lastunk = $s;
 
       # PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(1, 'blib/lib', 'blib/arch')" t/basic_*
-      if ($s =~ /test_harness\(.*?\)" (.+)$/) {
-        $suite_name = $1;
-      }
-      elsif ($s =~ /^Test Summary Report$/) {
+      # if ($s =~ /test_harness\(.*?\)" (.+)$/) {
+      # $suite_name = $1;
+      # }
+      if ($s =~ /^Test Summary Report$/) {
         # create a <testsuite> block for the summary
         $ctx->{plan_ntests} = 0;
         $ctx->{test_name} = "Test Summary Report";
@@ -210,8 +211,8 @@
   #my $elapsed_time = tv_interval( $ctx->{start_time}, [gettimeofday] );
 
   # clean it up to valid Java packagename format
-  my $name = $suite_name.": ".$ctx->{test_name};
-  $name =~ s/[^-_A-Za-z0-9]+/_/gs;
+  my $name = $suite_name.":".$ctx->{test_name};
+  $name =~ s/[^-:_A-Za-z0-9]+/_/gs;
 
   my $testsuite = {
       'time'         => $elapsed_time,