[OE-core] [PATCH] meta/lib/oeqa/selftest/wic.py: dynamic BSP name loading + small typo

[Costin Constantin]

Signed-off-by: Costin Constantin <costin.c.constantin at intel.com>
---
 meta/lib/oeqa/selftest/wic.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 358f09e..45abd3b 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -52,7 +52,7 @@ class Wic(oeSelfTest):
 
     def test02_createhelp(self):
         """Test wic create --help"""
-        self.assertEqual(0, runCmd('wic creat --help').status)
+        self.assertEqual(0, runCmd('wic create --help').status)
 
     def test03_listhelp(self):
         """Test wic list --help"""
@@ -66,12 +66,18 @@ class Wic(oeSelfTest):
 
     def test05_build_artifacts(self):
         """Test wic create directdisk providing all artifacts."""
-        self.assertEqual(0, runCmd("wic create directdisk "
-                                   "-b tmp/sysroots/qemux86/usr/share "
-                                   "-k tmp/deploy/images/qemux86 "
-                                   "-n tmp/sysroots/x86_64-linux "
-                                   "-r tmp/work/qemux86-poky-linux/"
-                                   "core-image-minimal/1.0-r0/rootfs").status)
+        self.append_config("wic_test_var = \"${MACHINE}\"")
+        self.machine_name = runCmd("bitbake -e | egrep '^wic_test_var='").output
+        self.machine_name = self.machine_name.replace("-","_")
+        self.machine_name = self.machine_name.split('"')[1]
+        self.wic_command = "wic create directdisk \
+                            -b tmp/sysroots/qemux86/usr/share \
+                            -k tmp/deploy/images/qemux86 \
+                            -n tmp/sysroots/x86_64-linux \
+                            -r tmp/work/" + self.machine_name + \
+                            "-poky-linux/core-image-minimal/1.0-r0/rootfs"
+        self.wic_command = " ".join(self.wic_command.split())
+        self.assertEqual(0, runCmd(self.wic_command).status)
         self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
 
     def test06_gpt_image(self):
-- 
2.1.4