[PATCH 0/2] A couple of misc fixes

[PATCH 0/2] A couple of misc fixes

[Paul Eggleton]

Two not-really-related fixes I made while working on devtool recently. The
oe-selftest patch adds a test that would have caught the regression that
occurred with wildcard support in bitbake-layers remove-layer.


The following changes since commit fb29441216435b9bae47ca9cd42db5a6b1fe77d8:

  oeqa/parselogs: Skip hda opcode errors (2015-03-12 12:49:22 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/fixes3
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes3

Paul Eggleton (2):
  waffle: drop unneeded setting of EXTRA_OECMAKE
  oe-selftest: improve bitbake-layers tests

 meta/lib/oeqa/selftest/bblayers.py           | 27 ++++++++++++++++++++++-----
 meta/recipes-graphics/waffle/waffle_1.3.0.bb |  3 ---
 2 files changed, 22 insertions(+), 8 deletions(-)

-- 
1.9.3

[PATCH 1/2] waffle: drop unneeded setting of EXTRA_OECMAKE

[Paul Eggleton]

base.bbclass already sets EXTRA_OECMAKE when cmake.bbclass is inherited.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-graphics/waffle/waffle_1.3.0.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta/recipes-graphics/waffle/waffle_1.3.0.bb b/meta/recipes-graphics/waffle/waffle_1.3.0.bb
index a6d1acd..fe9609c 100644
--- a/meta/recipes-graphics/waffle/waffle_1.3.0.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.3.0.bb
@@ -26,7 +26,4 @@ PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev"
 # I say virtual/libgl, actually wants egl.pc
 PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb"
 
-# Take the flags added by PACKAGECONFIG and pass them to cmake.
-EXTRA_OECMAKE = "${EXTRA_OECONF}"
-
 FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake"
-- 
1.9.3

[PATCH 2/2] oe-selftest: improve bitbake-layers tests

[Paul Eggleton]

* Add a test for add-layer and remove-layer
* Correct message for test_bitbakelayers_showoverlayed()
* Improve test_bitbakelayers_flatten() to use a more unique name for the
  temp output directory and clean it up using track_for_cleanup()

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/lib/oeqa/selftest/bblayers.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py
index 449c17e..5b046d0 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -29,15 +29,32 @@ class BitbakeLayers(oeSelfTest):
     @testcase(90)
     def test_bitbakelayers_showoverlayed(self):
         result = runCmd('bitbake-layers show-overlayed')
-        self.assertTrue('aspell' in result.output, msg='xcursor-transparent-theme_0.1.1.bbappend file was not recognised')
+        self.assertTrue('aspell' in result.output, msg='aspell overlayed recipe was not recognised')
 
     @testcase(95)
     def test_bitbakelayers_flatten(self):
-        self.assertFalse(os.path.isdir(os.path.join(self.builddir, 'test')))
-        result = runCmd('bitbake-layers flatten test')
-        bb_file = os.path.join(self.builddir, 'test/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb')
+        testoutdir = os.path.join(self.builddir, 'test_bitbakelayers_flatten')
+        self.assertFalse(os.path.isdir(testoutdir))
+        self.track_for_cleanup(testoutdir)
+        result = runCmd('bitbake-layers flatten %s' % testoutdir)
+        bb_file = os.path.join(testoutdir, 'recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb')
         self.assertTrue(os.path.isfile(bb_file))
         contents = ftools.read_file(bb_file)
         find_in_contents = re.search("##### bbappended from meta-selftest #####\n(.*\n)*include test_recipe.inc", contents)
-        shutil.rmtree(os.path.join(self.builddir, 'test'))
         self.assertTrue(find_in_contents)
+
+    def test_bitbakelayers_add_remove(self):
+        result = runCmd('bitbake-layers show-layers')
+        self.assertNotIn('meta-skeleton', result.output, 'This test cannot run with meta-skeleton in bblayers.conf')
+        result = runCmd('bitbake-layers add-layer ../meta-skeleton')
+        result = runCmd('bitbake-layers show-layers')
+        self.assertIn('meta-skeleton', result.output)
+        result = runCmd('bitbake-layers remove-layer ../meta-skeleton')
+        result = runCmd('bitbake-layers show-layers')
+        self.assertNotIn('meta-skeleton', result.output)
+        result = runCmd('bitbake-layers add-layer ../meta-skeleton')
+        result = runCmd('bitbake-layers show-layers')
+        self.assertIn('meta-skeleton', result.output)
+        result = runCmd('bitbake-layers remove-layer */meta-skeleton')
+        result = runCmd('bitbake-layers show-layers')
+        self.assertNotIn('meta-skeleton', result.output)
-- 
1.9.3