summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2023-03-03 14:42:37 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-20 17:20:44 +0000
commit128dfd839f48a1d53a1b6c7374efbf9603376510 (patch)
treecd335d5aebe10d0ebfc69028722e840e4e09aa58
parentf3e03ceeef6ddfc6307238e4690ac2b22b90e383 (diff)
downloadpoky-128dfd839f48a1d53a1b6c7374efbf9603376510.tar.gz
oeqa/sdk: Improve Meson test
The meson wrapper setup command detection is broken in the case of an implicit setup command with an option with a space-separated argument, but the test was not detecting it since the case was not covered. Add the option `--warnlevel 1` to the meson command line to cover this case. (From OE-Core rev: 3fbcaaa01304bbc645ddf01ef91805811e3c7f54) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 54e9ee8a0c6c9fc89cbb743f0e4fc18607d503cf) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/sdk/cases/buildepoxy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildepoxy.py b/meta/lib/oeqa/sdk/cases/buildepoxy.py
index f69f720cd6..1c41b04169 100644
--- a/meta/lib/oeqa/sdk/cases/buildepoxy.py
+++ b/meta/lib/oeqa/sdk/cases/buildepoxy.py
@@ -32,7 +32,7 @@ class EpoxyTest(OESDKTestCase):
32 self.assertTrue(os.path.isdir(dirs["source"])) 32 self.assertTrue(os.path.isdir(dirs["source"]))
33 os.makedirs(dirs["build"]) 33 os.makedirs(dirs["build"])
34 34
35 log = self._run("meson -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs)) 35 log = self._run("meson --warnlevel 1 -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs))
36 # Check that Meson thinks we're doing a cross build and not a native 36 # Check that Meson thinks we're doing a cross build and not a native
37 self.assertIn("Build type: cross build", log) 37 self.assertIn("Build type: cross build", log)
38 self._run("ninja -C {build} -v".format(**dirs)) 38 self._run("ninja -C {build} -v".format(**dirs))