Skip to content

Commit 5092541

Browse files
nashifMaureenHelm
authored andcommitted
sanitycheck: disable erroring on warnings
--warnings-as-errors was basically doing nothing, it is the default. Replace this with an option to disable erroring on warning: -W, --disable-warnings-as-errors Fixes zephyrproject-rtos#26910 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent 88be2ea commit 5092541

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

scripts/sanity_chk/sanitylib.py

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,17 +1764,21 @@ def run_build(self, args=[]):
17641764

17651765
def run_cmake(self, args=[]):
17661766

1767-
ldflags = "-Wl,--fatal-warnings"
1768-
logger.debug("Running cmake on %s for %s" % (self.source_dir, self.platform.name))
1767+
if self.warnings_as_errors:
1768+
ldflags = "-Wl,--fatal-warnings"
1769+
cflags = "-Werror"
1770+
aflags = "-Wa,--fatal-warnings"
1771+
else:
1772+
ldflags = cflags = aflags = ""
17691773

1770-
# fixme: add additional cflags based on options
1774+
logger.debug("Running cmake on %s for %s" % (self.source_dir, self.platform.name))
17711775
cmake_args = [
1772-
'-B{}'.format(self.build_dir),
1773-
'-S{}'.format(self.source_dir),
1774-
'-DEXTRA_CFLAGS="-Werror ',
1775-
'-DEXTRA_AFLAGS=-Wa,--fatal-warnings',
1776-
'-DEXTRA_LDFLAGS="{}'.format(ldflags),
1777-
'-G{}'.format(self.generator)
1776+
f'-B{self.build_dir}',
1777+
f'-S{self.source_dir}',
1778+
f'-DEXTRA_CFLAGS="{cflags}"',
1779+
f'-DEXTRA_AFLAGS="{aflags}',
1780+
f'-DEXTRA_LDFLAGS="{ldflags}"',
1781+
f'-G{self.generator}'
17781782
]
17791783

17801784
if self.cmake_only:
@@ -1915,6 +1919,7 @@ def __init__(self, suite, instance, **kwargs):
19151919
self.generator = kwargs.get('generator', None)
19161920
self.generator_cmd = kwargs.get('generator_cmd', None)
19171921
self.verbose = kwargs.get('verbose', None)
1922+
self.warnings_as_errors = kwargs.get('warnings_as_errors', True)
19181923

19191924
@staticmethod
19201925
def log_info(filename, inline_logs):
@@ -2298,6 +2303,7 @@ def __init__(self, board_root_list=[], testcase_roots=[], outdir=None):
22982303
self.west_runner = None
22992304
self.generator = None
23002305
self.generator_cmd = None
2306+
self.warnings_as_errors = True
23012307

23022308
# Keep track of which test cases we've filtered out and why
23032309
self.testcases = {}
@@ -2903,7 +2909,8 @@ def calc_one_elf_size(instance):
29032909
inline_logs=self.inline_logs,
29042910
generator=self.generator,
29052911
generator_cmd=self.generator_cmd,
2906-
verbose=self.verbose
2912+
verbose=self.verbose,
2913+
warnings_as_errors=self.warnings_as_errors
29072914
)
29082915
future_to_test[executor.submit(pb.process, message)] = test.name
29092916

scripts/sanitycheck

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,10 @@ Artificially long but functional example:
412412
"run. Intended to be run by CI when tagging an official "
413413
"release. This database is used as a basis for comparison "
414414
"when looking for deltas in metrics such as footprint")
415-
parser.add_argument("-w", "--warnings-as-errors", action="store_true",
415+
416+
parser.add_argument("-W", "--disable-warnings-as-errors", action="store_true",
416417
help="Treat warning conditions as errors")
418+
417419
parser.add_argument(
418420
"-v",
419421
"--verbose",
@@ -799,6 +801,7 @@ def main():
799801
suite.west_flash = options.west_flash
800802
suite.west_runner = options.west_runner
801803
suite.verbose = VERBOSE
804+
suite.warnings_as_errors = not options.disable_warnings_as_errors
802805

803806
if options.ninja:
804807
suite.generator_cmd = "ninja"

0 commit comments

Comments
 (0)