Skip to content

Commit

Permalink
clang: upgrade to clang-10
Browse files Browse the repository at this point in the history
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I53413a2c857a7f6b4a32694d308e7d357e92dc18
  • Loading branch information
williamspatrick authored and geissonator committed May 21, 2020
1 parent 8439ac5 commit 80d0728
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
12 changes: 4 additions & 8 deletions build-unit-test-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,10 @@ RUN apt-get update && apt-get install -yy \
git \
dbus \
iputils-ping \
clang-8 \
clang-format-8 \
clang-tidy-8 \
clang-tools-8 \
clang-10 \
clang-format-10 \
clang-tidy-10 \
clang-tools-10 \
npm \
iproute2 \
libnl-3-dev \
Expand Down Expand Up @@ -252,10 +252,6 @@ RUN pip3 install pycodestyle
RUN pip3 install jsonschema
RUN pip3 install meson==0.53.2
# run-clang-tidy-8.py has not moved to python3 yet however it
# supports it for our needs to just switch it over
RUN sed -i '1s/python$/python3/' /usr/bin/run-clang-tidy-8.py
FROM openbmc-base as openbmc-lcov
RUN curl -L https://github.com/linux-test-project/lcov/archive/${PKG_REV['lcov']}.tar.gz | tar -xz && \
cd lcov-* && \
Expand Down
2 changes: 1 addition & 1 deletion scripts/format-code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ -f "setup.cfg" ]]; then
fi

# Allow called scripts to know which clang format we are using
export CLANG_FORMAT="clang-format-8"
export CLANG_FORMAT="clang-format-10"
IGNORE_FILE=".clang-ignore"
declare -a IGNORE_LIST

Expand Down
4 changes: 2 additions & 2 deletions scripts/unit-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ def analyze(self):
return

if os.path.isfile('.clang-tidy'):
check_call_cmd('run-clang-tidy-8.py', '-p', '.')
check_call_cmd('run-clang-tidy-10.py', '-p', '.')
maybe_make_valgrind()
maybe_make_coverage()
run_cppcheck()
Expand Down Expand Up @@ -893,7 +893,7 @@ def analyze(self):

# Run clang-tidy only if the project has a configuration
if os.path.isfile('.clang-tidy'):
check_call_cmd('run-clang-tidy-8.py', '-p',
check_call_cmd('run-clang-tidy-10.py', '-p',
'build')
# Run the basic clang static analyzer otherwise
else:
Expand Down

0 comments on commit 80d0728

Please sign in to comment.