From 0d273bfe0c5c77160d5d5fdbfc9b2a8c9f71a5c2 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 20 Aug 2020 10:30:26 +0200 Subject: tests: fbs test: Fix issues around missing git - update_fbs.py would use git directly, instead of the requested git executable - There are other corner cases for the git executable detection, which are now all captured under a more general exception type Credit to Christopher Friedt for pointing out the original issue. --- host/utils/update_fbs.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'host/utils') diff --git a/host/utils/update_fbs.py b/host/utils/update_fbs.py index 86dc2ca83..4f9c595b0 100755 --- a/host/utils/update_fbs.py +++ b/host/utils/update_fbs.py @@ -108,9 +108,12 @@ def verify(git_exe, uhd_path=None): accompanied by a change of the header. It also detects manual changes to the generated header files. """ + if not git_exe: + print("Cannot verify schema files (no git found), assuming pass") + return True try: - subprocess.check_output(("git", "status"), stderr=subprocess.STDOUT) - except subprocess.CalledProcessError as error: + subprocess.check_output((git_exe, "status"), stderr=subprocess.STDOUT) + except subprocess.CalledProcessError: print("Cannot verify schema files (not a git repo), assuming pass") return True try: -- cgit v1.2.3