build-unit-test-docker: upgrade meson to 1.5.1
Poky is using meson 1.5.1
Tested: run-unit-test-docker.sh runs correctly
Change-Id: I9b4b27b72118dcb15a9616ca78edf8a087cd4481
Signed-off-by: Ewelina Walkusz <ewelinax.walkusz@intel.com>
diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index f925432..c7a9036 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -943,7 +943,7 @@
isoduration \
isort \
jsonschema \
- meson==1.3.0 \
+ meson==1.5.1 \
requests
RUN npm install -g \
diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index cc4abdd..51318ea 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -25,7 +25,7 @@
# interpreter is not used directly but this resolves dependency ordering
# that would be broken if we didn't include it.
from mesonbuild import interpreter # noqa: F401
-from mesonbuild import coredata, optinterpreter
+from mesonbuild import optinterpreter, options
from mesonbuild.mesonlib import OptionKey
from mesonbuild.mesonlib import version_compare as meson_version_compare
@@ -904,9 +904,9 @@
opt The meson option which we are setting
val The value being converted
"""
- if isinstance(opts[key], coredata.UserBooleanOption):
+ if isinstance(opts[key], options.UserBooleanOption):
str_val = self._configure_boolean(val)
- elif isinstance(opts[key], coredata.UserFeatureOption):
+ elif isinstance(opts[key], options.UserFeatureOption):
str_val = self._configure_feature(val)
else:
raise Exception("Unknown meson option type")