use strict;
use warnings;
use POSIX qw(&strftime);
-use Getopt::Long;
+use Getopt::Long qw(:config no_ignore_case);
use Carp qw(&carp);
my $start=time();
my $component;
my $srcrpm;
my @file;
+my @target;
+# FIXME: Connect make paralellization to the children.
+my $distrojobs=2;
die if !GetOptions(
"i|userid=s"=>\$userid,
"force"=>\$force,
"c|component=s"=>\$component,
"s|srcrpm=s"=>\$srcrpm,
"file=s{,}"=>\@file,
+ "target=s{,}"=>\@target,
+ "D|distrojobs=s"=>\$distrojobs,
);
$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");
$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";
for my $file (@file) {
-f $file and -r $file or error "-f|--file $file not readable: $!";
}
+$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.
my $will_copy=@file || $component=~m{^/home/};
$parallel||=$will_copy ? 2 : 1;
my $basename="$_-$archuse";
my $dir="/var/lib/mock/$basename";
-d $dir or error "No distro: $dir";
- push @distrouse,$basename;
+ for my $target (@target ? @target : undef()) {
+ push @distrouse,{"distro"=>$basename,"target"=>$target};
+ }
}
}
# PID->distro
my %child;
-for my $distro (@distrouse) {
- my $rpmbuild="rpmbuild";
-
- my $cvsbasedir;
- my $cvsroot;
- my $cvsrepo;
- if ($component=~/^fedora(gdb|binutils|glibc)$/) {
- $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;
- $cvsroot=$fedoracvsroot;
- }
- if ($component=~/^rhel(gdb|binutils|glibc)$/) {
- $cvsrepo=$1;
- $cvsbasedir="RHEL-$1" if $distro=~/^epel-(\d+)-$arches_re$/;
- die "$component vs. $distro" 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";
- newdir $distrodir;
- $log="$distrodir/log";
- my $out="$distrodir/out";
-
- if ($parallel>1) {
- my $pid=fork();
- die if !defined $pid;
- if ($pid) {
- $child{$pid}=$distro;
- next;
+while (@distrouse || keys(%child)) {
+ while (keys(%child)<$distrojobs && @distrouse) {
+ my $distrouse=shift @distrouse;
+ my $distro=$distrouse->{"distro"};
+ my $target=$distrouse->{"target"};
+ my $rpmbuild="rpmbuild";
+
+ my $cvsbasedir;
+ my $cvsroot;
+ my $cvsrepo;
+ 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;
+ $cvsroot=$fedoracvsroot;
+ }
+ if ($component=~/^rhel/) {
+ $cvsrepo=$1;
+ $cvsbasedir="RHEL-$1" if $distro=~/^epel-(\d+)-$arches_re$/;
+ die "$component vs. $distro" 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 $builddir="$distrodir/build";
- newdir $builddir;
+ my $distrodir="$dir/$distro";
+ $distrodir.="-$target" if $target;
+ newdir $distrodir;
+ $log="$distrodir/log";
+ my $out="$distrodir/out";
+
+ if ($parallel>1) {
+ my $pid=fork();
+ die if !defined $pid;
+ if ($pid) {
+ $child{$pid}=$distro;
+ next;
+ }
+ }
- # Do not use mockrun as the rpm database may be in a different version.
- spawn "rpm -r /var/lib/mock/$distro/root -qa|sort >$distrodir/rpm-qa";
+ my $builddir="$distrodir/build";
+ newdir $builddir;
- $::distro=$distro;
- sub mockrun($)
- {
- my($c)=@_;
+ # Do not use mockrun as the rpm database may be in a different version.
+ spawn "rpm -r /var/lib/mock/$distro/root -qa|sort >$distrodir/rpm-qa";
- $c="export PATH=\"$path:\$PATH\"; $c" if $path;
- $c="export MAKEFLAGS=\"-j\$[`getconf _NPROCESSORS_ONLN`*3/2]\"; $c";
- $c="export http_proxy=http://127.0.0.1:3128/; $c";
- $c="set -ex; cd $builddir; $c";
- die "found ': $c" if $c=~/'/;
- spawn "mockrun $::distro '$c'";
- }
+ $::distro=$distro;
+ sub mockrun($)
+ {
+ my($c)=@_;
- if ($cvsbasedir) {
- die if !$cvsroot;
- die if !$cvsrepo;
- spawn "cd $distrodir; cvs -q -z3 -d $cvsroot co rpms/$cvsrepo/$cvsbasedir";
- my $componentdir="$distrodir/rpms/$cvsrepo/$cvsbasedir";
- -d $componentdir or die "Failed checkout to: $componentdir";
- # Required for RHEL; Fedora does so automatically.
- spawn "cd $componentdir/..; cvs -q -z3 -d $cvsroot co common";
- # Workaround (RHEL-5?) curl which uses `Pragma: nocache' on $http_proxy.
- subst sub { s{echo "curl }{$&-H 'Pragma: cache' }; },"$componentdir/../common/Makefile.common";
-
- for my $file (@file) {
- my $filebase=$file;
- $filebase=~s{^.*/}{};
- my $target="$componentdir/$filebase";
- # Some *.patch files may be new.
- # -f $target or die "File $file does not exist at $target";
- spawn "rm -f $target; cp -p $file $target";
+ $c="export PATH=\"$path:\$PATH\"; $c" if $path;
+ $c="export MAKEFLAGS=\"-j\$[`getconf _NPROCESSORS_ONLN`*3/2]\"; $c";
+ $c="export http_proxy=http://127.0.0.1:3128/; $c";
+ $c="set -ex; cd $builddir; $c";
+ die "found ': $c" if $c=~/'/;
+ spawn "mockrun $::distro '$c'";
}
- my $glob="$componentdir/*.src.rpm";
- @{[glob $glob]}==0 or die "Found some before test-srpm: $glob";
- # No `spawn' as we could get:
- # error: unpacking of archive failed on file X;4a56efef: cpio: MD5 sum mismatch
- mockrun "cd $componentdir; make test-srpm";
- my @srcrpm=(glob $glob);
- @srcrpm==1 or die "Did not find 1 srcrpm: @srcrpm";
- $srcrpm=$srcrpm[0];
- }
-
- if ($srcrpm) {
- my $srcrpmbasename=$srcrpm;
- $srcrpmbasename=~s{^.*/}{};
- spawn "cp -p $srcrpm $builddir/$srcrpmbasename";
+ if ($cvsbasedir) {
+ die if !$cvsroot;
+ die if !$cvsrepo;
+ spawn "cd $distrodir; cvs -q -z3 -d $cvsroot co rpms/$cvsrepo/$cvsbasedir";
+ my $componentdir="$distrodir/rpms/$cvsrepo/$cvsbasedir";
+ -d $componentdir or die "Failed checkout to: $componentdir";
+ # Required for RHEL; Fedora does so automatically.
+ spawn "cd $componentdir/..; cvs -q -z3 -d $cvsroot co common";
+ # Workaround (RHEL-5?) curl which uses `Pragma: nocache' on $http_proxy.
+ subst sub { s{echo "curl }{$&-H 'Pragma: cache' }; },"$componentdir/../common/Makefile.common";
+
+ for my $file (@file) {
+ my $filebase=$file;
+ $filebase=~s{^.*/}{};
+ my $target="$componentdir/$filebase";
+ # Some *.patch files may be new.
+ # -f $target or die "File $file does not exist at $target";
+ spawn "rm -f $target; cp -p $file $target";
+ }
- my $rpmbuildlocal=$rpmbuild.q{ --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm"};
- $rpmbuildlocal="orphanripper $rpmbuildlocal" if $cvsrepo && $cvsrepo eq "glibc";
- mockrun $rpmbuildlocal." --rebuild --with testsuite".($parallel<2 ? "" : " --with parallel")." $srcrpmbasename";
- }
+ my $glob="$componentdir/*.src.rpm";
+ @{[glob $glob]}==0 or die "Found some before test-srpm: $glob";
+ # No `spawn' as we could get:
+ # error: unpacking of archive failed on file X;4a56efef: cpio: MD5 sum mismatch
+ mockrun "cd $componentdir; make test-srpm";
+ my @srcrpm=(glob $glob);
+ @srcrpm==1 or die "Did not find 1 srcrpm: @srcrpm";
+ $srcrpm=$srcrpm[0];
+ }
- my $baretestsuite;
+ if ($srcrpm) {
+ my $srcrpmbasename=$srcrpm;
+ $srcrpmbasename=~s{^.*/}{};
+ spawn "cp -p $srcrpm $builddir/$srcrpmbasename";
- if ($component=~/^(gdb|binutils)cvs$/) {
- my $which=$1;
- my $cvsbare=$which eq "gdb" ? $gdbcvsbare : $binutilscvsbare;
- if (-d $cvsbare) {
- spawn "cp -a $cvsbare $builddir/src; cd $builddir/src; cvs update -A";
- } else {
- spawn "cd $builddir; cvs -q -z3 -d :pserver:anoncvs:\@sourceware.org:/cvs/src co $which";
+ my $rpmbuildlocal=$rpmbuild.q{ --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm"};
+ $rpmbuildlocal="orphanripper $rpmbuildlocal" if $cvsrepo && $cvsrepo eq "glibc";
+ mockrun $rpmbuildlocal." --rebuild --with testsuite".($parallel<2 ? "" : " --with parallel")." $srcrpmbasename";
}
- spawn "cd $builddir/src".q{; test -z "$(cvs update -A)"};
- $baretestsuite="$builddir/src";
- }
- if ($component=~/^archer-/) {
- if (-d $archermaster) {
- spawn "cp -a $archermaster $builddir/$component; cd $builddir/$component; git pull"
- } else {
- spawn "cd $builddir; git clone git://sourceware.org/git/archer.git; mv -f archer $component";
- }
- spawn "cd $builddir/$component; git checkout -b $component origin/$component; [ \"`git status`\" = \"# On branch $component\nnothing to commit (working directory clean)\" ]";
- $baretestsuite="$builddir/$component";
- }
+ my $baretestsuite;
- if ($component=~m{^/home/}) {
- spawn "cp -a $component $builddir/src; cd $builddir/src; find -name \"*.[oa]\" -o -name \"*.l[oa]\" -o -name gdb.sum -o -name gdb.log|xargs rm -f; make clean || :";
- $baretestsuite="$builddir/src";
- }
+ if ($component=~/^(gdb|binutils)cvs$/) {
+ my $which=$1;
+ my $cvsbare=$which eq "gdb" ? $gdbcvsbare : $binutilscvsbare;
+ if (-d $cvsbare) {
+ spawn "cp -a $cvsbare $builddir/src; cd $builddir/src; cvs update -A";
+ } else {
+ spawn "cd $builddir; cvs -q -z3 -d :pserver:anoncvs:\@sourceware.org:/cvs/src co $which";
+ }
+ spawn "cd $builddir/src".q{; test -z "$(cvs update -A)"};
+ $baretestsuite="$builddir/src";
+ }
- if ($baretestsuite) {
- for my $file (@file) {
- my $target="$baretestsuite/$file";
- if ($file=~m{[.](R?)patch$}) {
- my $R=$1;
- my $fileabs=$file;
- $fileabs=$ENV{"PWD"}."/$fileabs" if $fileabs!~m{^/};
- spawn "cd $baretestsuite; patch -${R}p".($component=~/binutils/ ? "0" : "1")." <$fileabs";
+ if ($component=~/^archer-/) {
+ if (-d $archermaster) {
+ spawn "cp -a $archermaster $builddir/$component; cd $builddir/$component; git pull"
} else {
- -f $target or $file=~m{/testsuite/} or die "File $file does not exist at $target";
- spawn "rm -f $target; cp -p $file $target";
+ spawn "cd $builddir; git clone git://sourceware.org/git/archer.git; mv -f archer $component";
}
+ spawn "cd $builddir/$component; git checkout -b $component origin/$component; [ \"`git status`\" = \"# On branch $component\nnothing to commit (working directory clean)\" ]";
+ $baretestsuite="$builddir/$component";
}
- 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;};
+ if ($component=~m{^/home/}) {
+ spawn "cp -a $component $builddir/src; cd $builddir/src; find -name \"*.[oa]\" -o -name \"*.l[oa]\" -o -name gdb.sum -o -name gdb.log|xargs rm -f; make clean || :";
+ $baretestsuite="$builddir/src";
+ }
- # 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;
+ if ($baretestsuite) {
+ for my $file (@file) {
+ my $target="$baretestsuite/$file";
+ if ($file=~m{[.](R?)patch$}) {
+ my $R=$1;
+ my $fileabs=$file;
+ $fileabs=$ENV{"PWD"}."/$fileabs" if $fileabs!~m{^/};
+ spawn "cd $baretestsuite; patch -${R}p".($component=~/binutils/ ? "0" : "1")." <$fileabs";
+ } else {
+ -f $target or $file=~m{/testsuite/} or die "File $file does not exist at $target";
+ spawn "rm -f $target; cp -p $file $target";
+ }
+ }
+
+ my $errs1="errs1";
+ $errs1.=" --target=$target" if $target;
+
+ 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);
+ # FSF GDB has no PIE support.
+ # @check=map({($_,"$_/-fPIE/-pie");} @check);
+ # 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;};
}
} else {
- my @check=($distro=~/-x86_64/ ? qw(-m64 -m32) : -m32);
- @check=map("check//unix/$_",@check);
- # FSF GDB has no PIE support.
- # @check=map({($_,"$_/-fPIE/-pie");} @check);
- # 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;};
+ die "internal error" if @target;
}
- }
- # Call gdbunpack only if no direct $out directory will be created.
- # It is needed only for .src.rpm-built testsuites, no matter how .src.rpm
- # got created.
- my @testinlog;
- if ($component=~/^(?:fedora|rhel)glibc$/) {
- @testinlog=(qr/={20}TESTING DETAILS={17}/,qr/={20}PLT RELOCS END={18}/);
- }
- if (@testinlog) {
- subst sub { s{^.*?\n($testinlog[0]\n.*\n$testinlog[1]\n).*$}{$1}s; },$log,$out;
- } elsif ($cvsbasedir || $srcrpm) {
- # Applies both to gdb and binutils.
- spawn "gdbunpack $log";
- }
+ # Call gdbunpack only if no direct $out directory will be created.
+ # It is needed only for .src.rpm-built testsuites, no matter how .src.rpm
+ # got created.
+ my @testinlog;
+ if ($component=~/^(?:fedora|rhel)glibc$/) {
+ @testinlog=(qr/={20}TESTING DETAILS={17}/,qr/={20}PLT RELOCS END={18}/);
+ }
+ if (@testinlog) {
+ subst sub { s{^.*?\n($testinlog[0]\n.*\n$testinlog[1]\n).*$}{$1}s; },$log,$out;
+ } elsif ($cvsbasedir || $srcrpm) {
+ # Applies both to gdb and binutils.
+ spawn "gdbunpack $log";
+ }
- exit 0 if $parallel>1;
-}
+ exit 0 if $parallel>1;
+ }
-while (1) {
- print STDERR "waiting for ".scalar(keys(%child))." children...\n";
+ print STDERR "waiting for ".scalar(keys(%child))." children, ".scalar(@distrouse)." distros to go...\n";
my $pid=wait();
- last if $pid==-1 && $!==10; # 10==No child processes
+ next if $pid==-1 && $!==10; # 10==No child processes
die "wait()==-1: $!" if $pid==-1;
die "not found pid $pid" if !$child{$pid};
error "weird status $? for pid $pid: ".$child{$pid} if $?;
print STDERR "finished: $pid ".$child{$pid}."\n";
delete $child{$pid};
}
-die "Uncollected children: ".keys(%child) if keys(%child);
+die if keys(%child);
+die if @distrouse;
sub timestr($)
{
git://git.jankratochvil.net / nethome.git / commitdiff