Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions test/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,37 @@ def test_nonfatal_continues_on_failure(self, linux, mocker):
mocker.patch.object(b, "check_artifacts", return_value=True)
result = b.build(target)
assert result.passed
assert result.warning
assert not result.failed

def test_warning_does_not_block_dependent_targets(self, linux, mocker):
b = Build(tree=linux, targets=["config"])
b.status["kselftest"] = BuildInfo("WARNING")
target = mocker.MagicMock()
target.name = "next"
target.nonfatal = False
target.dependencies = ["kselftest"]
target.preconditions = []
target.commands = [Command(["true"])]
mocker.patch.object(b, "run_cmd", return_value=True)
mocker.patch.object(b, "check_artifacts", return_value=True)
result = b.build(target)
assert result.passed
assert not result.skipped

def test_warning_target_build_not_failed(self, linux):
b = Build(tree=linux, targets=["config"])
b.status["config"] = BuildInfo("PASS")
b.status["kselftest"] = BuildInfo("WARNING")
assert not b.failed
assert b.passed

def test_fail_overrides_warning(self, linux):
b = Build(tree=linux, targets=["config"])
b.status["config"] = BuildInfo("FAIL")
b.status["kselftest"] = BuildInfo("WARNING")
assert b.failed
assert not b.passed


class TestHeaders:
Expand Down
24 changes: 22 additions & 2 deletions tuxmake/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def passed(self):
"""
`True` if this target passed.
"""
return self.status == "PASS"
return self.status in ("PASS", "WARNING")

@property
def skipped(self):
Expand All @@ -88,6 +88,13 @@ def skipped(self):
"""
return self.status == "SKIP"

@property
def warning(self):
"""
`True` if this target passed with warnings.
"""
return self.status == "WARNING"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also return PASS, otherwise dependent targets get skipped

return self.status in ("PASS", "WARNING").

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @bhcopeland should be fixed now.



class Build:
"""
Expand Down Expand Up @@ -591,6 +598,7 @@ def build(self, target):
target.prepare()

fail = False
had_nonfatal_failure = False
exclude_keys = getattr(target, "exclude_build_makevars", set())
for cmd in target.commands:
if not self.run_cmd(
Expand All @@ -601,6 +609,7 @@ def build(self, target):
):
if target.nonfatal:
self.log("W: command failed, continuing (nonfatal target)")
had_nonfatal_failure = True
else:
fail = True
break
Expand All @@ -611,6 +620,9 @@ def build(self, target):
if fail:
return BuildInfo("FAIL")

if had_nonfatal_failure:
return BuildInfo("WARNING")

return BuildInfo("PASS")

def check_artifacts(self, target):
Expand Down Expand Up @@ -667,7 +679,15 @@ def collect_metadata(self):
}
errors, warnings = self.parse_log()
self.metadata["results"] = {
"status": "PASS" if self.passed else "FAIL",
"status": (
"FAIL"
if self.failed
else (
"WARNING"
if any(info.warning for info in self.status.values())
else "PASS"
)
),
"targets": {
name: {"status": s.status, "duration": s.duration}
for name, s in self.status.items()
Expand Down
2 changes: 1 addition & 1 deletion tuxmake/target/kselftest-bpf.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "Kernel BPF selftest (kselftest)"
dependencies = kernel headers
nonfatal = true
commands = {make} -C tools/testing/selftests/ all
&& {make} -o all -C tools/testing/selftests/ install
&& {make} -i -C tools/testing/selftests/ install
&& {tar_caf} {build_dir}/kselftest-bpf.tar{z_ext} -C {build_dir}/kselftest_bpf_install .

[makevars]
Expand Down
2 changes: 1 addition & 1 deletion tuxmake/target/kselftest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies = config
runs_after = kselftest-merge
nonfatal = true
commands = {make} -C tools/testing/selftests all
&& {make} -o all -C tools/testing/selftests install
&& {make} -i -C tools/testing/selftests install
&& {tar_caf} {build_dir}/kselftest.tar{z_ext} -C {build_dir}/kselftest_install .

[makevars]
Expand Down
Loading