X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fhammock;h=a25c20e4e625158761d95acb1895b64dc236e22d;hp=51717333ef1a94486535082a3f7e8d87df173a74;hb=4b263c5830104cb97c249c234923ba6ca270fa8d;hpb=3f19f6ae3b6d16ed15d135118e28683f7957e73f

diff --git a/bin/hammock b/bin/hammock
index 5171733..a25c20e 100755
--- a/bin/hammock
+++ b/bin/hammock
@@ -10,13 +10,12 @@ my $start=time();
 
 my $gdbcvsbare=$ENV{"HOME"}."/redhat/gdb-cvs-bare";
 my $binutilscvsbare=$ENV{"HOME"}."/redhat/binutils-cvs-bare";
-my $archermaster=$ENV{"HOME"}."/redhat/master";
+my $archermaster=$ENV{"HOME"}."/redhat/archer-master";
 my $fedoracvsroot=q{:pserver:anonymous:@cvs.fedoraproject.org:/cvs/pkgs};
 my $rhelcvsroot=q{:pserver:anonymous:@192.168.67.2:3401/cvs/dist};
 my $arch_i386=qr{(?:x86|i\d86|ia32)}io;
 my $arch_x86_64=qr{(?:x8664|x86_64|em64t)}io;
 my @arches=qw(i386 x86_64);
-my $arches_re=qr{(?:i386|x86_64)};
 
 my $error=0;
 sub error
@@ -29,14 +28,16 @@ my $userid;
 my $force;
 my $parallel=9;	# 1 or 2 or 3
 my @distro;
+my @componentdistro;
 my @path;
 my @arch;
 my $component;
 my $srcrpm;
 my @file;
 my @target;
+my $configure;
 # FIXME: Connect make paralellization to the children.
-my $distrojobs=2;
+my $distrojobs;
 die if !GetOptions(
   "i|userid=s"=>\$userid,
     "force"=>\$force,
@@ -44,6 +45,7 @@ die if !GetOptions(
   "2|standard"=>sub { $parallel=2; },
   "3|parallel"=>sub { $parallel=3; },
   "d|distro=s{,}"=>\@distro,
+    "cd|componentdistro=s{,}"=>\@componentdistro,
   "p|path=s{,}"=>\@path,
   "a|arch=s{,}"=>\@arch,
   "c|component=s"=>\$component,
@@ -51,6 +53,7 @@ die if !GetOptions(
     "file=s{,}"=>\@file,
     "target=s{,}"=>\@target,
   "D|distrojobs=s"=>\$distrojobs,
+    "configure=s"=>\$configure,
 );
 $component and ($component=~m{^(?:(?:fedora|rhel)(?:gdb|binutils|glibc)|gdbcvs|binutilscvs|archer-.*|/home/.*)$} or die "-c|--component required to be: fedoragdb|rhelgdb|fedorabinutils|rhelbinutils|fedoraglibc|rhelglibc|gdbcvs|binutilscvs|archer-*|/home/*");
 $component and $component=~m{^/home/} and (-f "$component/gdb/gdbtypes.c" or die "$component/gdb/gdbtypes.c not found");
@@ -58,9 +61,13 @@ $component and $srcrpm and die "-c|--component excludes -s|--srcrpm";
 $component or $srcrpm or die "-c|--component or -s|--srcrpm required";
 $component||="";  # Make `eq' not complaining.
 @target and ($srcrpm or $component=~/^(?:fedora|rhel)/) and die "--target is available only for baretestsuite modes";
+my %target;
+do { error "Duplicate target: $_\n" if $target{$_}++; } for @target;
+@arch="x86_64" if @target&&!@arch;
 for my $file (@file) {
   -f $file and -r $file or error "-f|--file $file not readable: $!";
 }
+$distrojobs=(@target?1:2) if !defined $distrojobs;
 $distrojobs=~/^\d+$/ or die "-D|distrojobs must be a number: $distrojobs";
 $distrojobs>=1 or die "-D|distrojobs must be positive: $distrojobs";
 # User may want to modify ASAP her files submitted for the test.
@@ -69,10 +76,13 @@ $parallel||=$will_copy ? 2 : 1;
 error "Excessive arguments: @ARGV" if @ARGV;
 @arch=@arches if !@arch;
 my $path=join(":",@path) if @path;
+@componentdistro and @componentdistro!=@distro and die "--cd|--componentdistro must have the same elements count as -d|--distro";
+
+sub distro_normalize($;$)
+{
+  my($name,$force)=@_;
+  local $_=$name;
 
-# epel-\d-i386|fedora-\d-i386|fedora-rawhide-i386
-my @distrouse;
-for (@distro) {
   s{^/var/lib/mock/+}{};
   s{/+$}{};
   s/^.*$/\L$&/s;
@@ -80,15 +90,35 @@ for (@distro) {
   s/^(?:epel|rhel|centos)-?(\d)/epel-$1/;
   s/^(?:f|fedora)-?(\d)/fedora-$1/;
   my @archuse;
+  @archuse="" if -d "/var/lib/mock/$_";
   @archuse="i386" if s/-$arch_i386$//o;
   @archuse="x86_64" if s/-$arch_x86_64$//o;
+
+  for my $arch (@archuse?@archuse:@arch) {
+    my $dir="/var/lib/mock/$_".(!$arch?"":"-$arch");
+    $force or -d $dir or error "No distro: $dir";
+  }
+
+  return ($_,@archuse);
+}
+
+# epel-\d-i386|fedora-\d-i386|fedora-rawhide-i386
+my @distrouse;
+for my $distroi (0..$#distro) {
+  my $distro=$distro[$distroi];
+  my $componentdistro=$componentdistro[$distroi];
+  my @archuse;
+  if ($componentdistro) {
+    my $force=($componentdistro=~s/!$//);
+    ($componentdistro,@archuse)=distro_normalize $componentdistro,$force;
+    @archuse and die "--cd|--componentdistro must have no arch: ".join(" ",@archuse);
+  }
+  ($distro,@archuse)=distro_normalize $distro;
+  $componentdistro||=$distro;
   @archuse=@arch if !@archuse;
   for my $archuse (@archuse) {
-    my $basename="$_-$archuse";
-    my $dir="/var/lib/mock/$basename";
-    -d $dir or error "No distro: $dir";
-    for my $target (@target ? @target : undef()) {
-      push @distrouse,{"distro"=>$basename,"target"=>$target};
+    for my $target (@target?@target:undef()) {
+      push @distrouse,{"distro"=>$distro.(!$archuse?"":"-$archuse"),"componentdistro"=>$componentdistro,"target"=>$target};
     }
   }
 }
@@ -131,6 +161,16 @@ print STDERR "ID = $id | dir = $dir\n";
 error "No distros specified" if !@distrouse;
 die "$error errors seen, aborted" if $error;
 
+sub writefile
+{
+  my($fname,$content)=@_;
+
+  local *F;
+  open F,">$fname" or die $fname;
+  print F $content or die $fname;
+  close F or die $fname;
+}
+
 spawn "renice 20 -p $$";
 newdir $dir;
 $log="$dir/log";
@@ -140,14 +180,10 @@ my %dump=(
   "component"=>$component,
   "srcrpm"=>$srcrpm,
   "file"=>join("\n",@file),
+  "configure"=>$configure,
 );
 while (my($name,$val)=each(%dump)) {
-  next if !$val;
-  local *F;
-  my $fname="$dir/$name";
-  open F,">$fname" or die $fname;
-  print F "$val\n" or die $fname;
-  close F or die $fname;
+  writefile "$dir/$name","$val\n" if $val;
 }
 
 sub subst
@@ -163,9 +199,7 @@ sub subst
 
   &{$sub}() or die $_."\nError substituting $in";
 
-  open F,">$out" or die $out;
-  print F $_ or die $out;
-  close F or die $out;
+  writefile $out,$_;
 }
 
 # PID->distro
@@ -174,31 +208,33 @@ while (@distrouse || keys(%child)) {
   while (keys(%child)<$distrojobs && @distrouse) {
     my $distrouse=shift @distrouse;
     my $distro=$distrouse->{"distro"};
+    my $componentdistro=$distrouse->{"componentdistro"};
     my $target=$distrouse->{"target"};
     my $rpmbuild="rpmbuild";
 
     my $cvsbasedir;
     my $cvsroot;
     my $cvsrepo;
-    if ($component=~/^fedora/) {
+    if ($component=~/^fedora(.*)$/) {
       $cvsrepo=$1;
-      $cvsbasedir="F-$1" if $distro=~/^fedora-(\d+)-$arches_re$/;
-      $cvsbasedir="devel" if $distro=~/^fedora-rawhide-$arches_re$/;
-      die "$component vs. $distro" if !$cvsbasedir;
+      $cvsbasedir="F-$1" if $componentdistro=~/^fedora-(\d+)$/;
+      $cvsbasedir="devel" if $componentdistro=~/^fedora-rawhide$/;
+      die "$component vs. $componentdistro" if !$cvsbasedir;
       $cvsroot=$fedoracvsroot;
     }
-    if ($component=~/^rhel/) {
+    if ($component=~/^rhel(.*)$/) {
       $cvsrepo=$1;
-      $cvsbasedir="RHEL-$1" if $distro=~/^epel-(\d+)-$arches_re$/;
-      die "$component vs. $distro" if !$cvsbasedir;
+      $cvsbasedir="RHEL-$1" if $componentdistro=~/^epel-(\d+)$/;
+      die "$component vs. $componentdistro" if !$cvsbasedir;
       $cvsroot=$rhelcvsroot;
       # EPEL still uses Berkeley DB version 8 while F-11+ (F-10?) uses version 9.
       # Using db_dump and db_load would no longer make it mock compatible.
       $rpmbuild.=q{ --dbpath $PWD --nodeps};
     }
 
-    my $distrodir="$dir/$distro";
-    $distrodir.="-$target" if $target;
+    my $distrodirbase=$distro;
+    $distrodirbase.="-$target" if $target;
+    my $distrodir="$dir/$distrodirbase";
     newdir $distrodir;
     $log="$distrodir/log";
     my $out="$distrodir/out";
@@ -207,7 +243,7 @@ while (@distrouse || keys(%child)) {
       my $pid=fork();
       die if !defined $pid;
       if ($pid) {
-	$child{$pid}=$distro;
+	$child{$pid}=$distrodirbase;
 	next;
       }
     }
@@ -316,16 +352,10 @@ while (@distrouse || keys(%child)) {
 
       my $errs1="errs1";
       $errs1.=" --target=$target" if $target;
+      $errs1.=" $configure" if $configure;
 
       if ($component eq "binutilscvs") {
 	mockrun "cd $baretestsuite; $errs1; errs2; ulimit -c unlimited; orphanripper make -k check || :; mkdir $out; ".q{for file in {gas/testsuite/gas,ld/ld,binutils/binutils}.{sum,log};do ln $file}." $out/binutils-$distro-".q{$(basename $file) || :; done;};
-
-	# gdbunpack does:
-	#		perl -i -pe 's{\Q'"$HOME"'\E/.*?/build/[^/]*/}{}g' "$base"/*
-	my $HOME=$ENV{"HOME"};
-	for my $file (<$out/*>) {
-	  subst sub { s{\Q$HOME\E/.*?/build/[^/]*/}{}g; },$file;
-	}
       } else {
 	my @check=($distro=~/-x86_64/ ? qw(-m64 -m32) : -m32);
 	@check=map("check//unix/$_",@check);
@@ -334,6 +364,12 @@ while (@distrouse || keys(%child)) {
 	# for i in ".join(" ",@check).";do orphanripper make -k \$i || :;done
 	mockrun "cd $baretestsuite; $errs1; errs2; cd gdb; ulimit -c unlimited; orphanripper make -k ".join(" ",@check)." || :; mkdir $out; ".q{for t in sum log;do for file in testsuite*/gdb.$t;do suffix="${file#testsuite.unix.}"; suffix="${suffix%/gdb.$t}"; ln $file}." $out/gdb-$distro".q{$suffix.$t || :; done; done;};
       }
+      # gdbunpack does:
+      #		perl -i -pe 's{\Q'"$HOME"'\E/.*?/build/[^/]*/}{}g' "$base"/*
+      my $HOME=$ENV{"HOME"};
+      for my $file (<$out/*>) {
+	subst sub { s{\Q$HOME\E/.*?/build/[^/]*/}{}g; },$file;
+      }
     } else {
       die "internal error" if @target;
     }
@@ -386,7 +422,8 @@ sub timestr($)
 }
 
 print STDERR "ID = $id | dir = $dir\n";
-print STDERR "total time=".timestr(time()-$start)."\n";
+my $time=timestr(time()-$start);
+print STDERR "total time=$time\n";
+writefile "$dir/time","$time\n";
 die "$error errors seen, aborted" if $error;
-
 print STDERR "done\n";