stash: fix GetLoneAppends

if a bbappend would have contained a require or
include statement, the links of the include file
would have been computed the same as a bb file,
thus preventing to identify the bbappend as a
scanable file, if it would have been passed alone
into the stash parsing.

Fix that by limiting the "linked appends" to bb files only.

Closes #150

Signed-off-by: Konrad Weihmann <[email protected]>

oelint_parser/cls_stash.py

@@ -139,7 +139,7 @@ def GetLoneAppends(self):
         for x in self.__list:
             if x.Origin.endswith(".bbappend"):
                 __appends.append(x.Origin)
-            else:
+            elif x.Origin.endswith(".bb"):
                 __linked_appends += x.Links
         return sorted({x for x in __appends if x not in __linked_appends})
 

tests/test_bbappends.py

@@ -0,0 +1,42 @@
+from logging import log
+import unittest
+import os
+import sys
+
+
+class OelintBBAppendsTest(unittest.TestCase):
+
+    RECIPE = os.path.join(os.path.dirname(__file__), "testlayer/recipes-appends/test.bb")
+    RECIPE_APPEND = os.path.join(os.path.dirname(__file__), "testlayer/recipes-appends/test.bbappend")
+
+    def setUp(self):
+        sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + "/../"))
+
+    def test_recipe(self):
+        from oelint_parser.cls_stash import Stash
+        self.__stash = Stash()
+        self.__stash.AddFile(OelintBBAppendsTest.RECIPE)
+        self.__stash.Finalize()
+        self.assertEqual(len(self.__stash.GetLoneAppends()), 0, msg="No lone appends")
+        self.assertEqual(len(self.__stash.GetRecipes()), 1, msg="One recipe")
+
+    def test_bbappend(self):
+        from oelint_parser.cls_stash import Stash
+        self.__stash = Stash()
+        self.__stash.AddFile(OelintBBAppendsTest.RECIPE_APPEND)
+        self.__stash.Finalize()
+        self.assertEqual(len(self.__stash.GetLoneAppends()), 1, msg="One lone appends")
+        self.assertEqual(len(self.__stash.GetRecipes()), 0, msg="No recipe")
+
+    def test_bbappend_and_recipe(self):
+        from oelint_parser.cls_stash import Stash
+        self.__stash = Stash()
+        self.__stash.AddFile(OelintBBAppendsTest.RECIPE)
+        self.__stash.AddFile(OelintBBAppendsTest.RECIPE_APPEND)
+        self.__stash.Finalize()
+        self.assertEqual(len(self.__stash.GetLoneAppends()), 0, msg="No lone appends")
+        self.assertEqual(len(self.__stash.GetRecipes()), 1, msg="One recipe")
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/testlayer/recipes-appends/test.bb

@@ -0,0 +1,3 @@
+require test.inc
+
+B = "1"

tests/testlayer/recipes-appends/test.bbappend

@@ -0,0 +1,3 @@
+require test.inc
+
+C = "3"

tests/testlayer/recipes-appends/test.inc

@@ -0,0 +1 @@
+A = "1"