Skip to content

Commit

Permalink
Merge branch 'master' into qemu-network
Browse files Browse the repository at this point in the history
Merging final parallelJobs files in to avoid duplicate commits + other master changes
  • Loading branch information
raghav-g13 committed Apr 8, 2022
2 parents 1233cd9 + 90c2221 commit c2d06a4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion boards/default/firmware/riscv-pk
10 changes: 9 additions & 1 deletion marshal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))
Expand Down Expand Up @@ -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__":
Expand Down
7 changes: 3 additions & 4 deletions test/linux-src/copy-src.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c2d06a4

Please sign in to comment.