[gs-commits] rev 11660 - trunk/gs/toolbin/localcluster

regression at ghostscript.com regression at ghostscript.com
Fri Aug 27 12:02:47 UTC 2010


Author: regression
Date: 2010-08-27 12:02:46 +0000 (Fri, 27 Aug 2010)
New Revision: 11660

Modified:
   trunk/gs/toolbin/localcluster/build.pl
   trunk/gs/toolbin/localcluster/clustermaster.pl
   trunk/gs/toolbin/localcluster/compare.pl
   trunk/gs/toolbin/localcluster/readlog.pl
   trunk/gs/toolbin/localcluster/run.pl
Log:
Added the ability to specify which regression test files will only be
run during nightly regression testing (i.e. not for commit regression
tests).  To skip files add them, one per line, to the nightly_only.lst
file in the corresponding directory (creating this file if none exists).
See tests_private/customer_tests/nightly_only.lst for an example.



Modified: trunk/gs/toolbin/localcluster/build.pl
===================================================================
--- trunk/gs/toolbin/localcluster/build.pl	2010-08-26 23:34:28 UTC (rev 11659)
+++ trunk/gs/toolbin/localcluster/build.pl	2010-08-27 12:02:46 UTC (rev 11660)
@@ -321,6 +321,20 @@
 #print "$testSource\n";
     my $a=`svn list $testSource`;
 
+    my %nightly_only;
+    if (!$local) {
+      unlink "nightly_only.lst";
+      my $b=`svn export $testSource/nightly_only.lst 2> /dev/null`;
+      if (open(F,"<nightly_only.lst")) {
+        foreach (<F>) {
+          chomp;
+          $nightly_only{$_}=1;
+        }
+        close(F);
+        unlink "nightly_only.lst";
+      }
+    }
+
     my $t1=$testSource;
     my $t2=$svnURLPrivate;
     my $t3=$svnURLPublic ;
@@ -335,6 +349,9 @@
     my @a=split '\n',$a;
     foreach (@a) {
       chomp;
+      if (exists $nightly_only{$_} || $_ eq "nightly_only.lst") {
+#print STDERR "skipping: $_\n";
+      } else {
       my $testfile=$t1.'/'.$_;
       if (exists $products{'mupdf'}) {
         $testfiles{'./'.$testfile}='mupdf'                  if (!($testfile =~ m|/$|) && !($testfile =~ m/^\./) && !($testfile =~ m/.disabled$/) && $testfile =~ m/.pdf$/i);
@@ -346,6 +363,7 @@
   }
 }
 }
+}
 
 #print Dumper(\%testfiles); exit;
 
@@ -636,6 +654,8 @@
     my $cmd="";
     my $outputFilenames="";
     my $filename="";
+    my @a=split ' ';
+    if (scalar(@a)==4) {
     if (m/^(.+)\.(pdf\.p.mraw\.\d+\.[01]) (\S+) pdfwrite /) {
 #       print "$1 $2 $3 -- pdfwrite\n";
       ($cmd,$outputFilenames,$filename)=build($3,$1,$2,!$local,1) if (!$done);
@@ -651,6 +671,7 @@
     } elsif (m/errors:$/ || m/previous clusterpush/i) {
       $done=1;
     }
+    }
     
   }
   close(F);

Modified: trunk/gs/toolbin/localcluster/clustermaster.pl
===================================================================
--- trunk/gs/toolbin/localcluster/clustermaster.pl	2010-08-26 23:34:28 UTC (rev 11659)
+++ trunk/gs/toolbin/localcluster/clustermaster.pl	2010-08-27 12:02:46 UTC (rev 11660)
@@ -504,8 +504,8 @@
   'gs/base' => 15,
   'gs/Resource' => 15,
   'gs/doc' => 0,
-# 'gs/toolbin' => 0,
-  'gs/toolbin' => 15,
+  'gs/toolbin' => 0,
+# 'gs/toolbin' => 15,  # used to force a run of all test files
   'gs/examples' => 0,
   'gs/lib' => 0,
   'gs/freetype' => 15,

Modified: trunk/gs/toolbin/localcluster/compare.pl
===================================================================
--- trunk/gs/toolbin/localcluster/compare.pl	2010-08-26 23:34:28 UTC (rev 11659)
+++ trunk/gs/toolbin/localcluster/compare.pl	2010-08-27 12:02:46 UTC (rev 11660)
@@ -188,14 +188,16 @@
 
 my $first=0;
 
+if (!($previous=~m/users/)) {
 foreach my $t (sort keys %current) {
   if ($currentError{$t} =~ m/Seg_Fault/) {
-    print "\n*******************************************************************\nSeg faults with current rev:\n\n" if (!$first);
+    print "\n*****************************************************************************\nSeg faults with current rev:\n\n" if (!$first);
     $first=1;
     print "$t $currentMachine{$t} $currentError{$t}\n";
   }
 }
-print "\n*******************************************************************\n\n\n" if ($first);
+print "\n*****************************************************************************\n\n\n" if ($first);
+}
 
 
 foreach my $t (sort keys %previous) {

Modified: trunk/gs/toolbin/localcluster/readlog.pl
===================================================================
--- trunk/gs/toolbin/localcluster/readlog.pl	2010-08-26 23:34:28 UTC (rev 11659)
+++ trunk/gs/toolbin/localcluster/readlog.pl	2010-08-27 12:02:46 UTC (rev 11660)
@@ -61,12 +61,12 @@
     $divider=1;
   }
 
-  if (m/Unrecoverable error, exit code/ || m/Command exited with non-zero status/ || m/Command terminated by signal/ || m/Warning interpreter exited with error code/) {
+  if (m/Unrecoverable error, exit code/ || m/Command exited with non-zero status/ || m/Warning interpreter exited with error code/) {
     $error=1 if ($divider==0 && $error==0);
     $error=2 if ($divider==1 && $error==0);
     $results{$file}{"error"}=$error;
   }
-  if (m/Segmentation fault/ || m/Backtrace:/) {
+  if (m/Segmentation fault/ || m/Backtrace:/ || m/Command terminated by signal/) {
     $error=8 if ($divider==0 && $error==0);
     $error=9 if ($divider==1 && $error==0);
     $results{$file}{"error"}=$error;

Modified: trunk/gs/toolbin/localcluster/run.pl
===================================================================
--- trunk/gs/toolbin/localcluster/run.pl	2010-08-26 23:34:28 UTC (rev 11659)
+++ trunk/gs/toolbin/localcluster/run.pl	2010-08-27 12:02:46 UTC (rev 11660)
@@ -1203,6 +1203,9 @@
     updateStatus('Uploading log files');
     unlink "$machine.log.gz";
     unlink "$machine.out.gz";
+#   mylog "filtering log start";
+#   `grep -a -v DEBUG $machine.log >temp.log ; mv temp.log $machine.log`;
+#   mylog "filtering log done";
     `gzip $machine.log`;
     `gzip $machine.out`;
 



More information about the gs-commits mailing list