]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
cr-try-bisect: Remove obsolete sticky_branch machinery
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 15 Jul 2016 09:50:33 +0000 (10:50 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 18 Jul 2016 14:22:21 +0000 (15:22 +0100)
Once upon a time we tried to run one bisector for all the branches.
But that doesn't work because they would overwrite each others' mros,
making the bisector flap as main flights finish.

If sharing a bisector working tree is desirable, something more
complex will be needed.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
cr-try-bisect

index c345ebd4b6f57e425483199ef6e9576e9fe7e2bb..50a52d1241a048d86ff2f582901a95acce2df346 100755 (executable)
@@ -27,7 +27,6 @@ select_branch
 
 check_stop bisect.
 
-sticky=bisecting-sticky-branch
 startstamp=tmp/bisection-start-stamp
 
 anyflagfile=tmp/bisected-any.$branch
@@ -41,7 +40,6 @@ with-lock-ex -w $mrof.lock bash -xec "
 "
 
 if ! test -f $mrof; then
-        rm -f $sticky
         rm -f $startstamp
         echo "$branch no mro"
         exit 0
@@ -53,18 +51,9 @@ if grep '^tolerable$' $mrof >/dev/null 2>&1; then
        rm -f tmp/bisected.$branch.*
 fi
 
-if test -f $sticky; then
-        read <$sticky sticky_branch
-        if [ "x$sticky_branch" != "x$branch" ]; then
-                echo "$branch but sticky $sticky_branch, skipping"
-                exit 0
-        fi
-fi
-
 compute_state_done_callback () {
         touch $flagfile
         touch $anyflagfile
-        rm -f $sticky
 }
 
 compute_state_callback () {
@@ -75,8 +64,6 @@ compute_state_callback () {
 }
 
 perhaps_bisect_step_core_testing_callback () {
-#        echo $branch >$sticky.new
-#        mv -f $sticky.new $sticky
        printf "%s\n%s\n%s\n" $branch $job $testid >$startstamp.new
        touch -r $mrof -m $startstamp.new
        cmp $startstamp $startstamp.new || mv -f $startstamp.new $startstamp