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 $srcrpm;
my @file;
my @target;
+my $configure;
+my $branch;
# FIXME: Connect make paralellization to the children.
my $distrojobs;
die if !GetOptions(
"file=s{,}"=>\@file,
"target=s{,}"=>\@target,
"D|distrojobs=s"=>\$distrojobs,
+ "configure=s"=>\$configure,
+ "branch=s"=>\$branch,
);
$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.
+my $cvsbranch;
+if ($component=~/^(gdb|binutils)cvs$/) {
+ $cvsbranch=(!$branch?"-A":"-r $branch");
+} else {
+ die "--branch currently unsupported for non-CVS sources" if $branch;
+}
@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;
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($)
+sub distro_normalize($;$)
{
- local $_=$_[0];
+ my($name,$force)=@_;
+ local $_=$name;
s{^/var/lib/mock/+}{};
s{/+$}{};
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";
- -d $dir or error "No distro: $dir";
+ my $dir="/var/lib/mock/$_".(!$arch?"":"-$arch");
+ $force or -d $dir or error "No distro: $dir";
}
return ($_,@archuse);
my $componentdistro=$componentdistro[$distroi];
my @archuse;
if ($componentdistro) {
- ($componentdistro,@archuse)=distro_normalize $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;
@archuse=@arch if !@archuse;
for my $archuse (@archuse) {
for my $target (@target?@target:undef()) {
- push @distrouse,{"distro"=>"$distro-$archuse","componentdistro"=>$componentdistro,"target"=>$target};
+ push @distrouse,{"distro"=>$distro.(!$archuse?"":"-$archuse"),"componentdistro"=>$componentdistro,"target"=>$target};
}
}
}
"component"=>$component,
"srcrpm"=>$srcrpm,
"file"=>join("\n",@file),
+ "configure"=>$configure,
);
while (my($name,$val)=each(%dump)) {
writefile "$dir/$name","$val\n" if $val;
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";
+ spawn "cp -a $cvsbare $builddir/src; cd $builddir/src; cvs update $cvsbranch";
} else {
- spawn "cd $builddir; cvs -q -z3 -d :pserver:anoncvs:\@sourceware.org:/cvs/src co $which";
+ spawn "cd $builddir; cvs -q -z3 -d :pserver:anoncvs:\@sourceware.org:/cvs/src co $cvsbranch $which";
}
- spawn "cd $builddir/src".q{; test -z "$(cvs update -A)"};
+ spawn "cd $builddir/src; test -z \"\$(cvs update $cvsbranch)\"";
$baretestsuite="$builddir/src";
}
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);
# 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;
}