aboutsummaryrefslogtreecommitdiffstats
path: root/host/utils
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2020-08-20 10:30:26 +0200
committerAaron Rossetto <aaron.rossetto@ni.com>2020-08-25 07:10:53 -0500
commit0d273bfe0c5c77160d5d5fdbfc9b2a8c9f71a5c2 (patch)
tree1686ab559cdee1087da59c8250889638b30aa0b6 /host/utils
parentdb0d2dddcc5d8e39e2b7843a326ad9392bbb4c3f (diff)
downloaduhd-0d273bfe0c5c77160d5d5fdbfc9b2a8c9f71a5c2.tar.gz
uhd-0d273bfe0c5c77160d5d5fdbfc9b2a8c9f71a5c2.tar.bz2
uhd-0d273bfe0c5c77160d5d5fdbfc9b2a8c9f71a5c2.zip
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.
Diffstat (limited to 'host/utils')
-rwxr-xr-xhost/utils/update_fbs.py7
1 files changed, 5 insertions, 2 deletions
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: