mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 23:52:08 +02:00
perf build: Raise minimum shellcheck version to 0.7.2
Raise the minimum shellcheck version for perf builds to 0.7.2, so that systems with shellcheck versions below 0.7.2 will automatically skip the shell script checking, even if NO_SHELLCHECK is unset. Since commit241f21be7d("perf test perftool_testsuite: Use absolute paths"), shellcheck versions before 0.7.2 break the perf build with several SC1090 [2] warnings due to its too strict dynamic source handling [1], e.g.: In tests/shell/base_probe/test_line_semantics.sh line 20: . "$DIR_PATH/../common/init.sh" ^---------------------------^ SC1090: Can't follow non-constant source. Use a directive to specify location. Fixes:241f21be7d("perf test perftool_testsuite: Use absolute paths") Signed-off-by: Nicolas Schier <n.schier@avm.de> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jakub Brnak <jbrnak@redhat.com> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Nicolas Schier <nsc@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Philipp Hahn <p.hahn@avm.de> Cc: Veronika Molnarova <vmolnaro@redhat.com> Link: https://github.com/koalaman/shellcheck/issues/1998 # [1] Link: https://www.shellcheck.net/wiki/SC1090 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
e272628902
commit
383f8e26e2
|
|
@ -251,11 +251,12 @@ else
|
|||
endif
|
||||
|
||||
# shellcheck is using in tools/perf/tests/Build with option -a/--check-sourced (
|
||||
# introduced in v0.4.7) and -S/--severity (introduced in v0.6.0). So make the
|
||||
# minimal shellcheck version as v0.6.0.
|
||||
# introduced in v0.4.7) and -S/--severity (introduced in v0.6.0) as well as
|
||||
# dynamic source inclusions (properly handled since v0.7.2).
|
||||
# So make the minimal shellcheck version as v0.7.2.
|
||||
ifneq ($(SHELLCHECK),)
|
||||
ifeq ($(shell expr $(shell $(SHELLCHECK) --version | grep version: | \
|
||||
sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \< 060), 1)
|
||||
sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \< 072), 1)
|
||||
SHELLCHECK :=
|
||||
else
|
||||
SHELLCHECK := $(SHELLCHECK) -s bash -a -S warning
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user