From 7fa32bcc68a3c7a9496c49bdb10f1fdc68cf5ddb Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Fri, 28 Feb 2020 17:32:48 -0800 Subject: [PATCH] Makefile: improve `make check` usefulness Silence the make echo'ing, so the output is cleaner. Add an exit code to check_whence.py, so we can get a real failure for bad WHENCE files. Signed-off-by: Brian Norris Signed-off-by: Josh Boyer --- Makefile | 2 +- check_whence.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 16b5b1a0..e1c362f3 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ FIRMWAREDIR = /lib/firmware all: check: - ./check_whence.py + @./check_whence.py install: mkdir -p $(DESTDIR)$(FIRMWAREDIR) diff --git a/check_whence.py b/check_whence.py index 4adbfc30..04f41dfc 100755 --- a/check_whence.py +++ b/check_whence.py @@ -33,6 +33,7 @@ def list_git(): yield line.rstrip('\n') def main(): + ret = 0 whence_list = list(list_whence()) known_files = set(name for name in whence_list if not name.endswith('/')) | \ set(['check_whence.py', 'configure', 'Makefile', @@ -42,6 +43,7 @@ def main(): for name in sorted(list(known_files - git_files)): sys.stderr.write('E: %s listed in WHENCE does not exist\n' % name) + ret = 1 for name in sorted(list(git_files - known_files)): # Ignore subdirectory changelogs and GPG detached signatures @@ -55,6 +57,8 @@ def main(): break else: sys.stderr.write('E: %s not listed in WHENCE\n' % name) + ret = 1 + return ret if __name__ == '__main__': - main() + sys.exit(main())