summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/tests
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/tests')
-rw-r--r--bitbake/lib/bb/tests/fetch.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index d8a36836d6..f6b11d51ea 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -482,9 +482,7 @@ class FetcherLocalTest(FetcherTest):
482 482
483 def test_local_wildcard(self): 483 def test_local_wildcard(self):
484 tree = self.fetchUnpack(['file://a', 'file://dir/*']) 484 tree = self.fetchUnpack(['file://a', 'file://dir/*'])
485 # FIXME: this is broken - it should return ['a', 'dir/c', 'dir/d', 'dir/subdir/e'] 485 self.assertEqual(tree, ['a', 'dir/c', 'dir/d', 'dir/subdir/e'])
486 # see https://bugzilla.yoctoproject.org/show_bug.cgi?id=6128
487 self.assertEqual(tree, ['a', 'b', 'dir/c', 'dir/d', 'dir/subdir/e'])
488 486
489 def test_local_dir(self): 487 def test_local_dir(self):
490 tree = self.fetchUnpack(['file://a', 'file://dir']) 488 tree = self.fetchUnpack(['file://a', 'file://dir'])
@@ -492,17 +490,15 @@ class FetcherLocalTest(FetcherTest):
492 490
493 def test_local_subdir(self): 491 def test_local_subdir(self):
494 tree = self.fetchUnpack(['file://dir/subdir']) 492 tree = self.fetchUnpack(['file://dir/subdir'])
495 # FIXME: this is broken - it should return ['dir/subdir/e'] 493 self.assertEqual(tree, ['dir/subdir/e'])
496 # see https://bugzilla.yoctoproject.org/show_bug.cgi?id=6129
497 self.assertEqual(tree, ['subdir/e'])
498 494
499 def test_local_subdir_file(self): 495 def test_local_subdir_file(self):
500 tree = self.fetchUnpack(['file://dir/subdir/e']) 496 tree = self.fetchUnpack(['file://dir/subdir/e'])
501 self.assertEqual(tree, ['dir/subdir/e']) 497 self.assertEqual(tree, ['dir/subdir/e'])
502 498
503 def test_local_subdirparam(self): 499 def test_local_subdirparam(self):
504 tree = self.fetchUnpack(['file://a;subdir=bar']) 500 tree = self.fetchUnpack(['file://a;subdir=bar', 'file://dir;subdir=foo/moo'])
505 self.assertEqual(tree, ['bar/a']) 501 self.assertEqual(tree, ['bar/a', 'foo/moo/dir/c', 'foo/moo/dir/d', 'foo/moo/dir/subdir/e'])
506 502
507 def test_local_deepsubdirparam(self): 503 def test_local_deepsubdirparam(self):
508 tree = self.fetchUnpack(['file://dir/subdir/e;subdir=bar']) 504 tree = self.fetchUnpack(['file://dir/subdir/e;subdir=bar'])