From a6f87f4e606499fabc22c74112131fa390df96dc Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Fri, 18 Feb 2022 18:10:30 -0500 Subject: [PATCH 1/3] bump bbl to latest master. This is needed for a planned qemu bump in chipyard (old BBL doesn't like new QEMU). --- boards/default/firmware/riscv-pk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/default/firmware/riscv-pk b/boards/default/firmware/riscv-pk index 5d9ed238..0d3339c7 160000 --- a/boards/default/firmware/riscv-pk +++ b/boards/default/firmware/riscv-pk @@ -1 +1 @@ -Subproject commit 5d9ed238e1cabfbca3c47f50d32894ce94bfc304 +Subproject commit 0d3339c73e8401a6dcfee2f0b97f6f52c81181c6 From ee442641bdf1be02764f6ce31ccc55926ef46df0 Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Fri, 18 Feb 2022 18:48:57 -0500 Subject: [PATCH 2/3] The linux-src test could get into a bad state if it was run before initializing FireMarshal's submodules. The error was pretty hard to diagnose. It now unconditionally copies over the linux source from the board instead of trying to check if it's already done it. The build takes a bit longer, but the test won't fail in strange ways. --- test/linux-src/copy-src.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/linux-src/copy-src.sh b/test/linux-src/copy-src.sh index 85215df7..a64365ee 100755 --- a/test/linux-src/copy-src.sh +++ b/test/linux-src/copy-src.sh @@ -1,7 +1,6 @@ #!/bin/bash set -e -if [ ! -d linux ]; then - rsync --exclude ".git" -r ../../boards/default/linux . - patch linux/kernel/reboot.c < test.patch -fi +rsync --exclude ".git" -r ../../boards/default/linux . +# rsync --exclude ".git" -r ./deleteme/linux . +patch linux/kernel/reboot.c < test.patch From f6bbe97548eed1c4f1c6db2c92abe042705e2cec Mon Sep 17 00:00:00 2001 From: Tim Snyder Date: Fri, 25 Mar 2022 01:18:02 +0000 Subject: [PATCH 3/3] Build failures should eventually cause marshal to exit non-zero (#234) other callers of marshal will expect the error to be indicated at a high level using exit code. Co-authored-by: Tim Snyder --- marshal | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/marshal b/marshal index 3821d99f..89cdf48c 100755 --- a/marshal +++ b/marshal @@ -152,6 +152,7 @@ def main(): if ret != 0: log.error("Failed to build workload " + cfgName) + failCount += 1 elif args.command == "launch": # job-configs are named special internally @@ -165,6 +166,7 @@ def main(): except Exception: log.exception("Failed to launch workload:") outputPath = None + failCount += 1 if outputPath is not None: log.info("Workload outputs available at: " + str(outputPath)) @@ -220,8 +222,14 @@ def main(): else: log.error("FAILURE: " + str(failCount) + " tests failed") sys.exit(1) + elif args.command == 'build': + if failCount: + log.error(f"FAILURE: {failCount} builds failed") + sys.exit(1) + else: + log.info("SUCCESS: All builds completed successfully!") - sys.exit(0) + sys.exit(0 if failCount == 0 else 1) if __name__ == "__main__":