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{/+$}{};
for my $arch (@archuse?@archuse:@arch) {
my $dir="/var/lib/mock/$_-$arch";
- -d $dir or error "No distro: $dir";
+ $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;
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;
}