[gs-commits] rev 10873 - trunk/gs/toolbin/localcluster
regression at ghostscript.com
regression at ghostscript.com
Fri Mar 5 16:50:01 UTC 2010
Author: regression
Date: 2010-03-05 16:50:00 +0000 (Fri, 05 Mar 2010)
New Revision: 10873
Modified:
trunk/gs/toolbin/localcluster/build.pl
trunk/gs/toolbin/localcluster/clustermaster.pl
trunk/gs/toolbin/localcluster/compare.pl
trunk/gs/toolbin/localcluster/run.pl
Log:
Update the local cluster code to use the new pbm->png mode of bmpcmp.
Modified: trunk/gs/toolbin/localcluster/build.pl
===================================================================
--- trunk/gs/toolbin/localcluster/build.pl 2010-03-05 16:47:10 UTC (rev 10872)
+++ trunk/gs/toolbin/localcluster/build.pl 2010-03-05 16:50:00 UTC (rev 10873)
@@ -436,7 +436,7 @@
$cmd2a =~ s|/gs/|/head/|;
$cmd2c =~ s|$temp|$baselineRaster|;
$cmd.=" ; $timeCommand $cmd2a -sOutputFile='|gzip -1 -n >$baselineFilename.gz' $cmd2c >>$logFilename 2>&1";
- $cmd.=" ; bash -c \"./bmpcmp <(gunzip -c $outputFilename.gz) <(gunzip -c $baselineFilename.gz) $bmpcmpFilename 1 10\" ; gzip $bmpcmpFilename.* ";
+ $cmd.=" ; bash -c \"./bmpcmp <(gunzip -c $outputFilename.gz) <(gunzip -c $baselineFilename.gz) $bmpcmpFilename 1 1000\""; # ; gzip $bmpcmpFilename.* ";
$cmd.=" ; scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $bmpcmpFilename.* regression\@casper3.ghostscript.com:/home/regression/cluster/bmpcmp/.";
# $cmd.=" ; scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $logFilename regression\@casper3.ghostscript.com:/home/regression/cluster/bmpcmp/.";
} else {
@@ -445,7 +445,7 @@
}
if ($rerunIfMd5sumDifferences && exists $md5sum{$filename2} && !exists $skip{$filename2}) {
- $cmd.=" ; sleep 1 ; grep -q -E \"".$md5sum{$filename2}."\" $md5Filename; a=\$? ; if [ \"\$a\" -eq \"1\" -a -e raster.yes ]; then $cmd2a -sOutputFile='|gzip -1 -n >$rasterFilename.gz' $cmd2c >>/dev/null 2>&1; bash -c \"./bmpcmp <(gunzip -c $rasterFilename.gz) <(gunzip -c $baselineFilename.gz) $bmpcmpFilename 1 10\" ; gzip $bmpcmpFilename.* ; fi";
+ $cmd.=" ; sleep 1 ; grep -q -E \"".$md5sum{$filename2}."\" $md5Filename; a=\$? ; if [ \"\$a\" -eq \"1\" -a -e raster.yes ]; then $cmd2a -sOutputFile='|gzip -1 -n >$rasterFilename.gz' $cmd2c >>/dev/null 2>&1; bash -c \"./bmpcmp <(gunzip -c $rasterFilename.gz) <(gunzip -c $baselineFilename.gz) $bmpcmpFilename 1 1000\" ; gzip $bmpcmpFilename.* ; fi";
}
# $cmd.=" ; gzip -f $inputFilename >>$logFilename 2>&1";
@@ -507,7 +507,7 @@
$cmd.=" ; $timeCommand $cmd2a -sOutputFile='|gzip -1 -n >$outputFilename.gz' $cmd2c >>$logFilename 2>&1";
$cmd2a =~ s|/gs/|/head/|;
$cmd.=" ; $timeCommand $cmd2a -sOutputFile='|gzip -1 -n >$baselineFilename.gz' $cmd2c >>$logFilename 2>&1";
- $cmd.=" ; bash -c \"./bmpcmp <(gunzip -c $outputFilename.gz) <(gunzip -c $baselineFilename.gz) $bmpcmpFilename 1 10\" ; gzip $bmpcmpFilename.* ";
+ $cmd.=" ; bash -c \"./bmpcmp <(gunzip -c $outputFilename.gz) <(gunzip -c $baselineFilename.gz) $bmpcmpFilename 1 10\""; # ; gzip $bmpcmpFilename.* ";
$cmd.=" ; scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $bmpcmpFilename.* regression\@casper3.ghostscript.com:/home/regression/cluster/bmpcmp/.";
# $cmd.=" ; scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $logFilename regression\@casper3.ghostscript.com:/home/regression/cluster/bmpcmp/.";
} else {
@@ -571,7 +571,7 @@
# print "$1 $2 $3\n";
($cmd,$outputFilenames,$filename)=build($3,$1,$2,1,1) if (!$done);
print "$filename\t$cmd\n" if (!$done);
- } elsif (m/errors:$/) {
+ } elsif (m/errors:$/ || m/previous clusterpush/i) {
$done=1;
}
Modified: trunk/gs/toolbin/localcluster/clustermaster.pl
===================================================================
--- trunk/gs/toolbin/localcluster/clustermaster.pl 2010-03-05 16:47:10 UTC (rev 10872)
+++ trunk/gs/toolbin/localcluster/clustermaster.pl 2010-03-05 16:50:00 UTC (rev 10873)
@@ -448,7 +448,8 @@
'gs/doc' => 0,
'gs/toolbin' => 0,
'gs/examples' => 0,
- 'language_switch' => 0
+ 'language_switch' => 0,
+ 'tools' => 0
);
#my $currentRev1=`svn info ghostpdl | grep "Last Changed Rev" | awk '{ print \$4} '`;
@@ -992,11 +993,15 @@
$logs.=" $_.log $_.out";
$tabs.=" $_.tab";
} else {
- mylog "ERROR: log or out missing for $_\n";
+ if ($failOccured) {
+ mylog "Warning: $_.log or $_.out missing (ignoring because failOccured is true)\n";
+ } else {
+ mylog "ERROR: $_.log or $_.out missing\n";
my $a=`ls -ls *log* *out*`;
mylog "ls:\n$a";
- unlink $runningSemaphore;
- exit;
+ unlink $runningSemaphore;
+ exit;
+ }
}
}
Modified: trunk/gs/toolbin/localcluster/compare.pl
===================================================================
--- trunk/gs/toolbin/localcluster/compare.pl 2010-03-05 16:47:10 UTC (rev 10872)
+++ trunk/gs/toolbin/localcluster/compare.pl 2010-03-05 16:50:00 UTC (rev 10873)
@@ -334,6 +334,24 @@
}
}
+my $first=1;
+foreach my $t (sort keys %current) {
+ if ($t =~ m/(.+\.)1$/) {
+ $t2=$1.'0';
+ if (exists $current{$t2}) {
+ if ($current{$t} ne $current{$t2} && (!exists $previous{$t} || !exists $previous{$t2} || $previous{$t} eq $previous{$t2})) {
+ if ($first) {
+ print "\nThe following files are showing a new mismatch between banded and page mode:\n";
+ $first=0;
+ }
+ print "$t\n";
+ }
+ }
+ }
+}
+print "\n" if (!$first);
+
+
if (@archiveMatch) {
print "-------------------------------------------------------------------------------------------------------\n\n";
print "The following ".scalar(@archiveMatch)." regression file(s) had differences but matched at least once in the previous $previousValues runs:\n";
Modified: trunk/gs/toolbin/localcluster/run.pl
===================================================================
--- trunk/gs/toolbin/localcluster/run.pl 2010-03-05 16:47:10 UTC (rev 10872)
+++ trunk/gs/toolbin/localcluster/run.pl 2010-03-05 16:50:00 UTC (rev 10873)
@@ -170,6 +170,7 @@
my $raster="./temp/raster";
my $bmpcmpOutput="./temp/bmpcmp";
my $baselineRaster="./baselineraster";
+my $baselineRaster2="./baselineraster.tmp";
my $gpdlSource=$baseDirectory."/ghostpdl";
my $gsSource=$gpdlSource."/gs";
@@ -364,17 +365,6 @@
mylog($message);
}
-`cc -o bmpcmp ghostpdl/gs/toolbin/bmpcmp.c`;
-`rm -f 0*debug.icc`;
-`rm -f 1*debug.icc`;
-`rm -f 2*debug.icc`;
-`rm -f 3*debug.icc`;
-`rm -f 4*debug.icc`;
-`rm -f 5*debug.icc`;
-`rm -f 6*debug.icc`;
-`rm -f 7*debug.icc`;
-`rm -f 8*debug.icc`;
-`rm -f 9*debug.icc`;
if (!$local) {
if (!$user) {
@@ -442,7 +432,13 @@
`$cmd`;
}
-mkdir "baselineraster";
+#`cc -o bmpcmp ghostpdl/gs/toolbin/bmpcmp.c`;
+`cc -I$baseDirectory/ghostpdl/gs/libpng -o bmpcmp -DHAVE_LIBPNG $baseDirectory/ghostpdl/gs/toolbin/bmpcmp.c $baseDirectory/ghostpdl/gs/libpng/png.c $baseDirectory/ghostpdl/gs/libpng/pngerror.c $baseDirectory/ghostpdl/gs/libpng/pnggccrd.c $baseDirectory/ghostpdl/gs/libpng/pngget.c $baseDirectory/ghostpdl/gs/libpng/pngmem.c $baseDirectory/ghostpdl/gs/libpng/pngpread.c $baseDirectory/ghostpdl/gs/libpng/pngread.c $baseDirectory/ghostpdl/gs/libpng/pngrio.c $baseDirectory/ghostpdl/gs/libpng/pngrtran.c $baseDirectory/ghostpdl/gs/libpng/pngrutil.c $baseDirectory/ghostpdl/gs/libpng/pngset.c $baseDirectory/ghostpdl/gs/libpng/pngtrans.c $baseDirectory/ghostpdl/gs/libpng/pngvcrd.c $baseDirectory/ghostpdl/gs/libpng/pngwio.c $baseDirectory/ghostpdl/gs/libpng/pngwrite.c $baseDirectory/ghostpdl/gs/libpng/pngwtran.c $baseDirectory/ghostpdl/gs/libpng/pngwutil.c -lm -lz`;
+
+$cmd="touch $baselineRaster2 ; rm -fr $baselineRaster2 ; mv $baselineRaster $baselineRaster2 ; mkdir $baselineRaster ; rm -fr $baselineRaster2 &";
+print "$cmd\n" if ($verbose);
+`$cmd`;
+
$cmd="touch $temp2 ; rm -fr $temp2 ; mv $temp $temp2 ; mkdir $temp ; mkdir $raster ; mkdir $bmpcmpOutput ; touch raster.yes ; rm -fr $temp2 &";
print "$cmd\n" if ($verbose);
`$cmd`;
More information about the gs-commits
mailing list