[oe-commits] [openembedded-core] 26/39: selftest/wic: skip wic unit tests in case NLS is disable

git at git.openembedded.org git at git.openembedded.org
Thu Apr 6 23:52:06 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 8c3e6bdac0674755a1c8acf49ed38952a15fdff8
Author: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
AuthorDate: Wed Apr 5 15:34:26 2017 -0700

    selftest/wic: skip wic unit tests in case NLS is disable
    
    WIC test case requires wic-tools which in turn depends on intltool-native and
    gettext-native. However, if NLS is disable, the gettext-minimal-native is used instead
    of gettext-native causing a failure on intltool-native as seen below:
    
      checking for msgfmt... no
      checking for gmsgfmt... no
      configure: error: GNU gettext tools not found; required for intltool
      ERROR: Function failed: do_configure (log file is located at /home/lsandov1/poky/build/tmp/work/i586-poky-linux-musl/systemd-boot/232-r0/temp/log.do_configure.7518)
      ERROR: Task (/home/lsandov1/poky/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb:do_configure) failed with exit code '1'
      NOTE: Tasks Summary: Attempted 609 tasks of which 604 didn't need to be rerun and 1 failed.
    
    [YOCTO #10902]
    
    Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oeqa/selftest/wic.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index df5e060..8030c35 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -77,7 +77,10 @@ class Wic(oeSelfTest):
         # clean up which can result in the native tools built earlier in
         # setUpClass being unavailable.
         if not Wic.image_is_ready:
-            bitbake('wic-tools')
+            if get_bb_var('USE_NLS') == 'yes':
+                bitbake('wic-tools')
+            else:
+                self.skipTest('wic-tools cannot be built due its (intltool|gettext)-native dependency and NLS disable')
 
             bitbake('core-image-minimal')
             Wic.image_is_ready = True

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list