diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2023-03-03 14:42:37 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-14 17:47:40 +0000 |
commit | 05df291218946226e352d8bf4d12e82267aca01b (patch) | |
tree | ea7f0d5d23cc828a2610d99c38febd51fddbae58 /meta/lib | |
parent | 0830f994b35584b7729d154bcc1b15a5d84737ed (diff) | |
download | poky-05df291218946226e352d8bf4d12e82267aca01b.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: 25d48a686f710655241e9c42acf5c31063b2af4b)
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>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/sdk/cases/buildepoxy.py | 2 |
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 ee515be188..147ee3e0ee 100644 --- a/meta/lib/oeqa/sdk/cases/buildepoxy.py +++ b/meta/lib/oeqa/sdk/cases/buildepoxy.py | |||
@@ -35,7 +35,7 @@ class EpoxyTest(OESDKTestCase): | |||
35 | self.assertTrue(os.path.isdir(dirs["source"])) | 35 | self.assertTrue(os.path.isdir(dirs["source"])) |
36 | os.makedirs(dirs["build"]) | 36 | os.makedirs(dirs["build"]) |
37 | 37 | ||
38 | log = self._run("meson -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs)) | 38 | log = self._run("meson --warnlevel 1 -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs)) |
39 | # Check that Meson thinks we're doing a cross build and not a native | 39 | # Check that Meson thinks we're doing a cross build and not a native |
40 | self.assertIn("Build type: cross build", log) | 40 | self.assertIn("Build type: cross build", log) |
41 | self._run("ninja -C {build} -v".format(**dirs)) | 41 | self._run("ninja -C {build} -v".format(**dirs)) |