Simplify $parallel.

--dwarf4 -> --dwarf=X
--noorphanripper

diff --git a/bin/hammock b/bin/hammock
index 748bb43..70de9cc 100755 (executable)
--- a/bin/hammock
+++ b/bin/hammock
@@ -28,7 +28,7 @@ sub error
 
 my $userid;
 my $force;
-my $parallel=9;        # 1 or 2 or 3
+my $parallel=1;
 my @distro;
 my @componentdistro;
 my @path;
@@ -51,13 +51,13 @@ my $strip;
 my $gdbserver;
 my $valgrind;
 my $gdbindex;
-my $dwarf4;
+my $dwarf;
+my $orphanripper=1;
 die if !GetOptions(
   "i|userid=s"=>\$userid,
     "force"=>\$force,
-  "1|serial"=>sub { $parallel=1; },
-  "2|standard"=>sub { $parallel=2; },
-  "3|parallel"=>sub { $parallel=3; },
+    "serial"=>sub { $parallel=0; },
+    "parallel"=>sub { $parallel=1; },
   "d|distro=s{,}"=>\@distro,
     "cd|componentdistro=s{,}"=>\@componentdistro,
   "p|path=s{,}"=>\@path,
@@ -74,7 +74,8 @@ die if !GetOptions(
     "gdbserver"=>\$gdbserver,
     "valgrind"=>\$valgrind,
     "gdbindex"=>\$gdbindex,
-    "dwarf4"=>\$dwarf4,
+    "dwarf=i"=>\$dwarf,
+    "orphanripper!"=>\$orphanripper,
 );
 $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");
@@ -94,7 +95,9 @@ $gdbserver and $component ne "gdbcvs" and die "--gdbserver is available only for
 $valgrind and $component ne "gdbcvs" and die "--valgrind is available only for gdbcvs";
 $gdbserver and $valgrind and die "--gdbserver and --valgrind are mutually exclusive";
 ($gdbserver || $valgrind) and $gdbindex and die "--gdbserver|--valgrind and --gdbindex are mutually exclusive";
-($gdbserver || $valgrind || $gdbindex) and $dwarf4 and die "--gdbserver|--valgrind|--gdbindex and --dwarf4 are mutually exclusive";
+!defined $dwarf or ($dwarf>=2 && $dwarf<=4) or die "--dwarf requires DWARF version number";
+($gdbserver || $valgrind || $gdbindex) and $dwarf and die "--gdbserver|--valgrind|--gdbindex and --dwarf are mutually exclusive";
+$orphanripper=($orphanripper?"orphanripper":"");
 my %target;
 do { error "Duplicate target: $_\n" if $target{$_}++; } for @target;
 @arch="x86_64" if @target&&!@arch;
@@ -104,9 +107,6 @@ for my $file (@file) {
 $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.
-my $will_copy=@file || $component=~m{^/home/};
-$parallel||=$will_copy ? 2 : 1;
 error "Excessive arguments: @ARGV" if @ARGV;
 @arch=@arches if !@arch;
 my $path=join(":",@path) if @path;
@@ -240,7 +240,8 @@ my %dump=(
   "gdbserver"=>$gdbserver,
   "valgrind"=>$valgrind,
   "gdbindex"=>$gdbindex,
-  "dwarf4"=>$dwarf4,
+  "dwarf"=>$dwarf,
+  "orphanripper"=>$orphanripper,
 );
 while (my($name,$val)=each(%dump)) {
   next if !$val;
@@ -327,7 +328,7 @@ while (@distrouse || keys(%child)) {
     my $out="$distrodir/out";
     newdir $out;
 
-    if ($parallel>1) {
+    if ($parallel) {
       my $pid=fork();
       die if !defined $pid;
       if ($pid) {
@@ -403,8 +404,8 @@ while (@distrouse || keys(%child)) {
       spawn "cp -p $srcrpm $builddir/$srcrpmbasename";
 
       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";
+      $rpmbuildlocal="$orphanripper $rpmbuildlocal" if $cvsrepo && $cvsrepo eq "glibc";
+      mockrun $rpmbuildlocal." --rebuild --with testsuite $srcrpmbasename";
     }
 
     my $baretestsuite;
@@ -453,23 +454,28 @@ while (@distrouse || keys(%child)) {
       $errs12.=" $configure" if $configure;
 
       if ($component eq "binutilscvs") {
-       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;};
+       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; $errs12"
+       # for i in ".join(" ",@check).";do $orphanripper make -k \$i || :;done
+       mockrun "cd $baretestsuite;"
+               .(!$valgrind?"":' HAMMOCK_VALGRIND=1')
+               ." $errs12"
                .(!$valgrind?"":' --without-python')    # FIXME: Fix valgrind --suppressions
                ."; cd gdb; ulimit -c unlimited; "
                .(!$gdbserver?"":'DEJAGNU=$HOME/src/runtest-gdbserver/site.exp ')
                .(!$valgrind?"":'DEJAGNU=$HOME/src/runtest-valgrind/site.exp ')
-               ."orphanripper make -k ".join(" ",@check)
+               ."$orphanripper make -k ".join(" ",@check)
+               # Ensure serial run if FORCE_PARALLEL=1 is not present
+               ." RUNTESTFLAGS=DUMMY=dummy"
                .(!$gdbserver?"":' RUNTESTFLAGS=--target_board=native-gdbserver')
                .(!$valgrind?"":' RUNTESTFLAGS=--target_board=valgrind')
                .(!$gdbindex?"":' RUNTESTFLAGS="CC_FOR_TARGET=/bin/sh\ $PWD/cc-with-index.sh\ gcc CXX_FOR_TARGET=/bin/sh\ $PWD/cc-with-index.sh\ g++"')
-               .(!$dwarf4?"":' RUNTESTFLAGS="CC_FOR_TARGET=gcc\ -gdwarf-4\ -g0 CXX_FOR_TARGET=g++\ -gdwarf-4\ -g0"')
-               ." FORCE_PARALLEL=1 || :; ".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;};
+               .(!$dwarf?"":' RUNTESTFLAGS="CC_FOR_TARGET=gcc\ -gdwarf-'.$dwarf.'\ -g0 CXX_FOR_TARGET=g++\ -gdwarf-'.$dwarf.'\ -g0"')
+               .(!$parallel?"":' FORCE_PARALLEL=1')
+               ." || :; ".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"/*
@@ -513,7 +519,7 @@ while (@distrouse || keys(%child)) {
       link $fname,$d or warn $!;
     }
 
-    exit 0 if $parallel>1;
+    exit 0 if $parallel;
   }
 
   print STDERR "waiting for ".scalar(keys(%child))." children, ".scalar(@distrouse)." distros to go...\n";