diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-19 15:02:38 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-22 13:39:57 +0000 |
| commit | 4d14e7df1bb94791be11c8dcbe19d7f6aef46c22 (patch) | |
| tree | dde187de9e145fdfcb100c4d7dee24551082e259 | |
| parent | 5df7279a18e413df9767722fad273f5730083b88 (diff) | |
tcwg_kernel-bisect.sh: Cleanup handling of $good_rev.
Make it explicit that good_rev is set to baseline_rev.
Change-Id: I61bc702048aa43794661c04726bffda20995c3db
| -rwxr-xr-x | tcwg_kernel-bisect.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tcwg_kernel-bisect.sh b/tcwg_kernel-bisect.sh index d6af6dc1..87028e80 100755 --- a/tcwg_kernel-bisect.sh +++ b/tcwg_kernel-bisect.sh @@ -59,8 +59,7 @@ assert ! [ -f $artifacts/failures ] cd $current_project # Remember $good_rev from the baseline build above. -good_rev=$(git rev-parse HEAD) -baseline_rev="$good_rev" +baseline_rev=$(git rev-parse HEAD) ln -f -s "build-baseline" "$artifacts/build-$baseline_rev" ln -f -s "build-baseline.sh" "$artifacts/manifests/build-$baseline_rev.sh" echo "$baseline_rev" >> $artifacts/good_revs @@ -122,7 +121,7 @@ chmod +x $artifacts/test.sh # Workaround linux-next/master rebasing on top of linux-next/stable. # Try to find $good_rev that is "good" compared to baseline # and that is an ancesstor of both $baseline_rev and $bad_rev. -merge_base=$(git merge-base $bad_rev HEAD) +merge_base=$(git merge-base $bad_rev $baseline_rev) origin=$(git remote get-url origin) origin=$(basename "$origin") if [ x"$merge_base" != x"$good_rev" -a x"$origin" = x"linux-next.git" ]; then @@ -169,6 +168,8 @@ EOF : # With good merge-base below bisect should succeed. fi +else + good_rev=$baseline_rev fi ln -f -s "build-$good_rev" "$artifacts/build-good" |