my $gdbcvsmaster=$ENV{"HOME"}."/redhat/gdb-cvs-master";
my $binutilscvsmaster=$ENV{"HOME"}."/redhat/binutils-cvs-master";
my $archermaster=$ENV{"HOME"}."/redhat/archer-master";
-my $fedoracvsroot=q{:pserver:anonymous:@cvs.fedoraproject.org:/cvs/pkgs};
+my $fedoragitroot=q{git://pkgs.fedoraproject.org};
#Unknown host cvs.devel.redhat.com.
#my $rhelcvsroot=q{:pserver:anonymous:@cvs.devel.redhat.com:/cvs/dist};
-my $rhelcvsroot=q{:pserver:anonymous:@192.168.67.2:3401/cvs/dist};
+my $rhelcvsroot=q{:ext:cvs.devel.redhat.com:/cvs/dist};
my $arch_i386=qr{(?:x86|i\d86|ia32)}io;
my $arch_x86_64=qr{(?:x8664|x86_64|em64t)}io;
my $resultdir=$ENV{"HOME"}."/.hammock-result";
# FIXME: Connect make paralellization to the children.
my $distrojobs;
my $gdbcvspie;
+my $strip;
die if !GetOptions(
"i|userid=s"=>\$userid,
"force"=>\$force,
"configure=s"=>\$configure,
"branch=s"=>\$branch,
"gdbcvspie"=>\$gdbcvspie,
+ "strip"=>\$strip,
);
$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");
}
!$gdbcvspie or $component eq "gdbcvs" or die "--gdbcvspie requires -c gdbcvs";
@target and ($srcrpm or $component=~/^(?:fedora|rhel)/) and die "--target is available only for baretestsuite modes";
+$strip and ($srcrpm or $component=~/^(?:fedora|rhel)/) and die "--strip is available only for baretestsuite modes";
my %target;
do { error "Duplicate target: $_\n" if $target{$_}++; } for @target;
@arch="x86_64" if @target&&!@arch;
close F or die $fname;
}
-spawn "renice 20 -p $$";
+spawn "renice +19 -p $$";
+spawn "ionice -c3 -p $$";
newdir $dir;
$log="$dir/log";
my $resultid="$resultdir/$id";
writefile $out,$_;
}
+sub copyfiles($)
+{
+ my($targetdir)=@_;
+
+ for my $file (@file) {
+ my $filebase=$file;
+ $filebase=~s{^.*/}{};
+ my $target="$targetdir/$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";
+ }
+}
+
# PID->distro
my %child;
while (@distrouse || keys(%child)) {
my $rpmbuild="rpmbuild";
my $cvsbasedir;
+ my $gitbranch;
my $cvsroot;
+ my $gitroot;
my $cvsrepo;
+ my $gitrepo;
if ($component=~/^fedora(.*)$/) {
- $cvsrepo=$1;
- $cvsbasedir="F-$1" if $componentdistro=~/^fedora-(\d+)$/;
- $cvsbasedir="devel" if $componentdistro=~/^fedora-rawhide$/;
- die "$component vs. $componentdistro" if !$cvsbasedir;
- $cvsroot=$fedoracvsroot;
+ $gitrepo=$1;
+ $gitbranch="f$1/master" if $componentdistro=~/^fedora-(\d+)$/;
+ $gitbranch="master" if $componentdistro=~/^fedora-rawhide$/;
+ die "$component vs. $componentdistro" if !$gitbranch;
+ $gitroot=$fedoragitroot;
}
if ($component=~/^rhel(.*)$/) {
$cvsrepo=$1;
newdir $distrodir;
$log="$distrodir/log";
my $out="$distrodir/out";
+ newdir $out;
if ($parallel>1) {
my $pid=fork();
newdir $builddir;
# 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";
+ spawn "rpm -r /var/lib/mock/$distro/root -qa|sort >$out/rpm-qa";
$::distro=$distro;
sub mockrun($)
spawn "mockrun $::distro '$c'";
}
+ if ($gitbranch) {
+ die if !$gitroot;
+ die if !$gitrepo;
+ die if !$gitbranch;
+ spawn "cd $distrodir; git clone -b $gitbranch $gitroot/$gitrepo $component";
+ my $componentdir="$distrodir/$component";
+ -d $componentdir or die "Failed checkout to: $componentdir";
+ copyfiles $componentdir;
+ spawn "cd $componentdir; fedpkg verrel >$out/verrel";
+ 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; fedpkg srpm";
+ my @srcrpm=(glob $glob);
+ @srcrpm==1 or die "Did not find 1 srcrpm: @srcrpm";
+ $srcrpm=$srcrpm[0];
+ }
+
if ($cvsbasedir) {
die if !$cvsroot;
die if !$cvsrepo;
+ die if !$cvsbasedir;
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";
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";
- }
-
+ copyfiles $componentdir;
+ spawn "cd $componentdir; make verrel >$out/verrel";
my $glob="$componentdir/*.src.rpm";
@{[glob $glob]}==0 or die "Found some before test-srpm: $glob";
# No `spawn' as we could get:
}
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 "git clone ".(!-d $archermaster ? "" : "--reference $archermaster")." git://sourceware.org/git/archer.git $builddir/$component";
+ spawn "cd $builddir/$component; git fetch";
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 $R=$1;
my $fileabs=$file;
$fileabs=$ENV{"PWD"}."/$fileabs" if $fileabs!~m{^/};
- spawn "cd $baretestsuite; patch -${R}p".($component=~/binutils/ ? "0" : "1")." <$fileabs";
+ spawn "cd $baretestsuite; patch -${R}p1 <$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;
- $errs1.=" $configure" if $configure;
+ my $errs12="errs12";
+ $errs12.=" -s" if $strip;
+ $errs12.=" --target=$target" if $target;
+ $errs12.=" $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;};
+ mockrun "cd $baretestsuite; $errs12; ulimit -c unlimited; orphanripper make -k check || :; ".q{for file in {gas/testsuite/gas,ld/ld,binutils/binutils}.{sum,log};do ln $file}." $out/binutils-$distro-".q{$(basename $file) || :; done;};
} else {
my @check=($distro=~/-x86_64/ ? qw(-m64 -m32) : -m32);
@check=map("check//unix/$_",@check);
@check=map({($_,"$_/-fPIE/-pie");} @check) if $gdbcvspie;
# 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".q{$suffix.$t || :; done; done;};
+ mockrun "cd $baretestsuite; $errs12; cd gdb; ulimit -c unlimited; orphanripper make -k ".join(" ",@check)." || :; ".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".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/*>) {
+ for my $file (glob("$out/*.sum"),glob("$out/*.log")) {
subst sub { s{\Q$HOME\E/.*?/build/[^/]*/}{}g; },$file;
}
} else {
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";
+ spawn "mv $out $out.x; gdbunpack $log; mv $out.x/* $out/; rmdir $out.x";
}
my $resultout="$resultdir/$id/$distrodirbase";
git://git.jankratochvil.net / nethome.git / blobdiff