diff options
author | Marcos H. Woehrmann <marcos.woehrmann@artifex.com> | 2010-05-04 16:03:29 +0000 |
---|---|---|
committer | Marcos H. Woehrmann <marcos.woehrmann@artifex.com> | 2010-05-04 16:03:29 +0000 |
commit | 1a3a4aa332c4ac0e0710cc7306a69732747cc19a (patch) | |
tree | 4abf488acdd5fd318a2b13efa9b64e6b2f849146 /gs | |
parent | 49fa2573739b8cdfec6c69bc489f1ded247c5bb3 (diff) |
Changed casper3.ghostscript.com to casper.ghostscript.com (no reason to test this, how can it possibly fail?).
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@11175 a1074d23-0009-0410-80fe-cf8c14f379e6
Diffstat (limited to 'gs')
-rwxr-xr-x | gs/toolbin/localcluster/build.pl | 8 | ||||
-rwxr-xr-x | gs/toolbin/localcluster/clustermaster.pl | 2 | ||||
-rwxr-xr-x | gs/toolbin/localcluster/run.pl | 34 |
3 files changed, 22 insertions, 22 deletions
diff --git a/gs/toolbin/localcluster/build.pl b/gs/toolbin/localcluster/build.pl index 2adcf7474..dcf1a5460 100755 --- a/gs/toolbin/localcluster/build.pl +++ b/gs/toolbin/localcluster/build.pl @@ -456,8 +456,8 @@ sub build($$$$$) { $cmd2c =~ s|$temp|$baselineRaster|; $cmd.=" ; $preCommand $cmd2a -sOutputFile='|gzip -1 -n >$baselineFilename.gz' $cmd2c >>$logFilename 2>&1"; $cmd.=" ; bash -c \"nice ./bmpcmp $bmpcmpOptions <(gunzip -c $outputFilename.gz) <(gunzip -c $baselineFilename.gz) $bmpcmpFilename 0 100\""; # ; gzip $bmpcmpFilename.* "; - $cmd.=" ; bash -c \"for (( c=1; c<=5; c++ )); do scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $bmpcmpFilename.* regression\@casper3.ghostscript.com:/home/regression/cluster/bmpcmp/. ; t=\\\$?; if [ \\\$t == 0 ]; then break; fi; echo 'scp retry \\\$c' ; done \""; -# $cmd.=" ; scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $logFilename regression\@casper3.ghostscript.com:/home/regression/cluster/bmpcmp/."; + $cmd.=" ; bash -c \"for (( c=1; c<=5; c++ )); do scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $bmpcmpFilename.* regression\@casper.ghostscript.com:/home/regression/cluster/bmpcmp/. ; t=\\\$?; if [ \\\$t == 0 ]; then break; fi; echo 'scp retry \\\$c' ; done \""; +# $cmd.=" ; scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $logFilename regression\@casper.ghostscript.com:/home/regression/cluster/bmpcmp/."; } else { $cmd.=" ; echo \"$cmd2a $cmd2b $cmd2c\" >>$logFilename "; $cmd.=" ; $preCommand $cmd2a $cmd2b $cmd2c >>$logFilename 2>&1"; @@ -543,8 +543,8 @@ sub build($$$$$) { } $cmd.=" ; $preCommand $cmd2a -sOutputFile='|gzip -1 -n >$baselineFilename.gz' $cmd2c >>$logFilename 2>&1"; $cmd.=" ; bash -c \"nice ./bmpcmp $bmpcmpOptions <(gunzip -c $outputFilename.gz) <(gunzip -c $baselineFilename.gz) $bmpcmpFilename 0 100\""; # ; gzip $bmpcmpFilename.* "; - $cmd.=" ; bash -c \"for (( c=1; c<=5; c++ )); do scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $bmpcmpFilename.* regression\@casper3.ghostscript.com:/home/regression/cluster/bmpcmp/. ; t=\\\$?; if [ \\\$t == 0 ]; then break; fi; echo 'scp retry \\\$c' ; done \""; -# $cmd.=" ; scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $logFilename regression\@casper3.ghostscript.com:/home/regression/cluster/bmpcmp/."; + $cmd.=" ; bash -c \"for (( c=1; c<=5; c++ )); do scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $bmpcmpFilename.* regression\@casper.ghostscript.com:/home/regression/cluster/bmpcmp/. ; t=\\\$?; if [ \\\$t == 0 ]; then break; fi; echo 'scp retry \\\$c' ; done \""; +# $cmd.=" ; scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $logFilename regression\@casper.ghostscript.com:/home/regression/cluster/bmpcmp/."; } else { $cmd.=" ; echo \"$cmd2a $cmd2b $cmd2c\" >>$logFilename "; $cmd.=" ; $preCommand $cmd2a $cmd2b $cmd2c >>$logFilename 2>&1"; diff --git a/gs/toolbin/localcluster/clustermaster.pl b/gs/toolbin/localcluster/clustermaster.pl index f416a6ca3..48bbc2522 100755 --- a/gs/toolbin/localcluster/clustermaster.pl +++ b/gs/toolbin/localcluster/clustermaster.pl @@ -281,7 +281,7 @@ sub checkProblem { } -{ +if (0) { my $cmd="cd mupdf ; darcs pull -a"; my $value=`$cmd`; chomp $value; diff --git a/gs/toolbin/localcluster/run.pl b/gs/toolbin/localcluster/run.pl index 6c6f0dbed..3c3220fe2 100755 --- a/gs/toolbin/localcluster/run.pl +++ b/gs/toolbin/localcluster/run.pl @@ -365,11 +365,11 @@ sub checkAbort { return(0) if ($local); checkPID(); return (1) if ($abort==1); - spawn(60,"scp -q -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com:/home/regression/cluster/$machine.abort . >/dev/null 2>/dev/null"); + spawn(60,"scp -q -i ~/.ssh/cluster_key regression\@casper.ghostscript.com:/home/regression/cluster/$machine.abort . >/dev/null 2>/dev/null"); if (-e "$machine.abort") { mylog("found $machine.abort on casper\n"); mylog("removing $machine.abort on casper\n"); - spawn(70,"ssh -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com \"rm /home/regression/cluster/$machine.abort\""); + spawn(70,"ssh -i ~/.ssh/cluster_key regression\@casper.ghostscript.com \"rm /home/regression/cluster/$machine.abort\""); killAll(); return(1); } @@ -380,7 +380,7 @@ sub updateStatus($) { my $message=shift; if (!$local) { `echo '$message' >$machine.status`; - spawn(0,"scp -q -i ~/.ssh/cluster_key $machine.status regression\@casper3.ghostscript.com:/home/regression/cluster/$machine.status"); + spawn(0,"scp -q -i ~/.ssh/cluster_key $machine.status regression\@casper.ghostscript.com:/home/regression/cluster/$machine.status"); } mylog($message); } @@ -422,7 +422,7 @@ if (!$abort) { updateStatus('Fetching mupdf.tar.gz'); `touch mupdf ; rm -fr mupdf; touch mupdf.tar.gz ; rm mupdf.tar.gz`; for (my $retry=0; $retry<5; $retry++) { - my $a=`scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com:/home/regression/cluster/mupdf.tar.gz .`; + my $a=`scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key regression\@casper.ghostscript.com:/home/regression/cluster/mupdf.tar.gz .`; last if ($?==0); my $b=$?; chomp $a; @@ -648,13 +648,13 @@ if (-e '../bin/time') { if ($md5sumFail ne "") { updateStatus('md5sum fail'); -mylog("setting $machine.fail on casper3\n"); -spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com \"touch /home/regression/cluster/$machine.fail\""); +mylog("setting $machine.fail on casper\n"); +spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper.ghostscript.com \"touch /home/regression/cluster/$machine.fail\""); @commands=(); } elsif ($compileFail ne "") { updateStatus('Compile fail'); -mylog("setting $machine.fail on casper3\n"); -spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com \"touch /home/regression/cluster/$machine.fail\""); +mylog("setting $machine.fail on casper\n"); +spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper.ghostscript.com \"touch /home/regression/cluster/$machine.fail\""); @commands=(); } else { updateStatus('Starting jobs'); @@ -800,8 +800,8 @@ while (($poll==1 || scalar(@commands)) && !$abort && $compileFail eq "") { # mylog "killed: $pids{$pid}{'filename'}\n"; # mhw if ($count>=$maxTimeout) { $timeoutFail="too many timeouts"; -mylog("setting $machine.fail on casper3\n"); -spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com \"touch /home/regression/cluster/$machine.fail\""); +mylog("setting $machine.fail on casper\n"); +spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper.ghostscript.com \"touch /home/regression/cluster/$machine.fail\""); updateStatus('Timeout fail'); @commands=(); $maxCount=0; @@ -953,8 +953,8 @@ if (!$abort || $compileFail ne "" || $timeoutFail ne "") { # mylog "killed: $pids{$pid}{'filename'}\n"; # mhw if ($count>=$maxTimeout) { $timeoutFail="too many timeouts"; -mylog("setting $machine.fail on casper3\n"); -spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com \"touch /home/regression/cluster/$machine.fail\""); +mylog("setting $machine.fail on casper\n"); +spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper.ghostscript.com \"touch /home/regression/cluster/$machine.fail\""); updateStatus('Timeout fail'); @commands=(); $maxCount=0; @@ -1068,7 +1068,7 @@ if (!$local) { for (my $retry=0; $retry<5; $retry++) { mylog "about to upload $machine.log.gz"; - my $a=`scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $machine.log.gz regression\@casper3.ghostscript.com:/home/regression/cluster/$machine.log.gz`; + my $a=`scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $machine.log.gz regression\@casper.ghostscript.com:/home/regression/cluster/$machine.log.gz`; last if ($?==0); my $b=$?; chomp $a; @@ -1079,7 +1079,7 @@ if (!$local) { for (my $retry=0; $retry<5; $retry++) { mylog "about to upload $machine.out.gz"; - my $a=`scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $machine.out.gz regression\@casper3.ghostscript.com:/home/regression/cluster/$machine.out.gz 2>&1`; + my $a=`scp -q -o ConnectTimeout=30 -i ~/.ssh/cluster_key $machine.out.gz regression\@casper.ghostscript.com:/home/regression/cluster/$machine.out.gz 2>&1`; last if ($?==0); my $b=$?; chomp $a; @@ -1103,10 +1103,10 @@ if ($abort) { } if (!$local) { -mylog("setting $machine.done on casper3\n"); -spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com \"touch /home/regression/cluster/$machine.done\""); +mylog("setting $machine.done on casper\n"); +spawn(300,"ssh -i ~/.ssh/cluster_key regression\@casper.ghostscript.com \"touch /home/regression/cluster/$machine.done\""); mylog("removing $machine.abort on casper\n"); -spawn(70,"ssh -i ~/.ssh/cluster_key regression\@casper3.ghostscript.com \"rm /home/regression/cluster/$machine.abort\""); +spawn(70,"ssh -i ~/.ssh/cluster_key regression\@casper.ghostscript.com \"rm /home/regression/cluster/$machine.abort\""); } system("date") if ($debug2); |