commit f5a982995096fcd33e62b8a4f42f8fb8805e2fd1
author Brad Bishop <bradleyb@fuzziesquirrel.com> Fri Mar 29 16:44:36 2019 -0400
committer Andrew Geissler <geissonator@yahoo.com> Tue Apr 02 13:03:27 2019 +0000
tree 7bc1f7a9305a3bbba88d4cdd1a5130641e075ffe
parent a1ee265ad8fa6f725be6a3113987b95261f1b7f4

unit-test: meson: allow missing meson-options.txt

meson-options.txt is not required, so avoid an ENOENT exception and
proceed with an empty set of options when meson-options.txt doesn't
exist.

Tested: Sucessfully ran run-unit-test-docker.sh against
https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19893/1

Change-Id: Ie063df12aa511f43f347db277858075bcecad024
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

scripts/unit-test.py

diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index c1c3f85..e946b83 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -401,7 +401,9 @@
     # Build & install this package
     # Always try using meson first
     if os.path.exists('meson.build'):
-        meson_options = parse_meson_options("meson_options.txt")
+        meson_options = sets.Set()
+        if os.path.exists("meson_options.txt"):
+            meson_options = parse_meson_options("meson_options.txt")
         meson_flags = [
             '-Db_colorout=never',
             '-Dwerror=true',