diff options
| author | jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2020-05-13 17:07:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 17:07:18 -0700 |
| commit | 7fb04e4fda7b521d4fde5214e78c1369231eca7d (patch) | |
| tree | cfe3d6769ad51a59cf9780a7ac5d8f975fa67ba4 /infra/base-images/base-clang | |
| parent | 0093bb28f425b06bfd4745af2060402d06b9a70f (diff) | |
| download | oss-fuzz-7fb04e4fda7b521d4fde5214e78c1369231eca7d.tar.gz | |
Fix clang updating script to actually track Chrome's (#3806)
Fix clang updating script to actually update clang based on Chrome's
With this change, clang (llvm-project) will be updated from:
e84b7a5fe230e42b8e6fe451369874a773bf1867
to Chrome's current version:
99ac9ce7016d701b43b8f0c308dc3463da57d983.
This commit fixes two bad bugs:
1. Using the output of a command instead of the return code.
2. Using ! to determine whether the command succeeded ! in bash
will do the same thing for 0 and 1.
These bugs were hidden by OUR_LLVM_REVISION which we traditionally
set to the last commit we rolled back to. If this were a comment
instead of stored as a variable that is not supposed to be used
unless FORCE_OUR_REVISION is set, this bug probably could have
been caught earlier. Instead, the code always used the value
provided by this variable.
Fixes https://github.com/google/oss-fuzz/issues/3805
Diffstat (limited to 'infra/base-images/base-clang')
| -rwxr-xr-x | infra/base-images/base-clang/checkout_build_install_llvm.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/infra/base-images/base-clang/checkout_build_install_llvm.sh b/infra/base-images/base-clang/checkout_build_install_llvm.sh index 4a1963ef8..44e512b7e 100755 --- a/infra/base-images/base-clang/checkout_build_install_llvm.sh +++ b/infra/base-images/base-clang/checkout_build_install_llvm.sh @@ -48,19 +48,25 @@ git clone https://chromium.googlesource.com/chromium/src/tools/clang cd clang LLVM_SRC=$SRC/llvm-project -OUR_LLVM_REVISION=e84b7a5fe230e42b8e6fe451369874a773bf1867 # For manual bumping. -FORCE_OUR_REVISION=0 # To allow for manual downgrades. + +# For manual bumping. +OUR_LLVM_REVISION=e84b7a5fe230e42b8e6fe451369874a773bf1867 + +# To allow for manual downgrades. Set to 0 to use Chrome's clang version (i.e. +# *not* force a manual downgrade). Set to 1 to force a manual downgrade. +FORCE_OUR_REVISION=0 LLVM_REVISION=$(grep -Po "CLANG_REVISION = '\K[a-f0-9]+(?=')" scripts/update.py) clone_with_retries https://github.com/llvm/llvm-project.git $LLVM_SRC set +e -IS_OUR_REVISION_ANCESTOR=$(git -C $LLVM_SRC merge-base --is-ancestor $OUR_LLVM_REVISION $LLVM_REVISION) +git -C $LLVM_SRC merge-base --is-ancestor $OUR_LLVM_REVISION $LLVM_REVISION +IS_OUR_REVISION_ANCESTOR_RETCODE=$? set -e -# Use our revision if specified or if our revision is a later revision than -# Chrome's. -if [ ! $IS_OUR_REVISION_ANCESTOR ] || [ $FORCE_OUR_REVISION ] ; then +# Use our revision if specified by FORCE_OUR_REVISION or if our revision is a +# later revision than Chrome's (i.e. not an ancestor of Chrome's). +if [ $IS_OUR_REVISION_ANCESTOR_RETCODE -ne 0 ] || [ $FORCE_OUR_REVISION -eq 1 ] ; then LLVM_REVISION=$OUR_LLVM_REVISION fi |