summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/tests/fetch.py
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2019-01-23 10:28:18 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-24 17:45:49 +0000
commit1979d9162a335b7d4718a6697ca57bfa16237f0e (patch)
tree166d38da68350879e5644a9e2ff73392e0381c07 /bitbake/lib/bb/tests/fetch.py
parent9238a725897e8ec18079c46f80edb9f2248133fc (diff)
downloadpoky-1979d9162a335b7d4718a6697ca57bfa16237f0e.tar.gz
bitbake: gitsmy.py: Fix unpack of submodules of submodules
If the submodule is in a subdirectory, it needs to have that structure preserved. This means the unpack path needs to be in the 'dirname' of the final path -- since the unpack directory name is specified in the URI. Additional specific test cases were added to ensure this is working properly based on two recent error reports. (Bitbake rev: 8c8ecec2a722bc2885e2648d41ac8df07bdf660d) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests/fetch.py')
-rw-r--r--bitbake/lib/bb/tests/fetch.py26
1 files changed, 26 insertions, 0 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index de3b0ce7bb..e9ad807677 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -912,6 +912,32 @@ class FetcherNetworkTest(FetcherTest):
912 if os.path.exists(os.path.join(repo_path, 'bitbake-gitsm-test1')): 912 if os.path.exists(os.path.join(repo_path, 'bitbake-gitsm-test1')):
913 self.assertTrue(os.path.exists(os.path.join(repo_path, 'bitbake-gitsm-test1', 'bitbake')), msg='submodule of submodule missing') 913 self.assertTrue(os.path.exists(os.path.join(repo_path, 'bitbake-gitsm-test1', 'bitbake')), msg='submodule of submodule missing')
914 914
915 # The following external repositories have show failures in fetch and unpack operations
916 # We want to avoid regressions!
917 url = "gitsm://github.com/bus1/dbus-broker;protocol=git;rev=fc874afa0992d0c75ec25acb43d344679f0ee7d2"
918 fetcher = bb.fetch.Fetch([url], self.d)
919 fetcher.download()
920 # Previous cwd has been deleted
921 os.chdir(os.path.dirname(self.unpackdir))
922 fetcher.unpack(self.unpackdir)
923
924 repo_path = os.path.join(self.tempdir, 'unpacked', 'git')
925 self.assertTrue(os.path.exists(os.path.join(repo_path, '.git/modules/subprojects/c-dvar/config')), msg='Missing submodule config "subprojects/c-dvar"')
926 self.assertTrue(os.path.exists(os.path.join(repo_path, '.git/modules/subprojects/c-list/config')), msg='Missing submodule config "subprojects/c-list"')
927 self.assertTrue(os.path.exists(os.path.join(repo_path, '.git/modules/subprojects/c-rbtree/config')), msg='Missing submodule config "subprojects/c-rbtree"')
928 self.assertTrue(os.path.exists(os.path.join(repo_path, '.git/modules/subprojects/c-sundry/config')), msg='Missing submodule config "subprojects/c-sundry"')
929 self.assertTrue(os.path.exists(os.path.join(repo_path, '.git/modules/subprojects/c-utf8/config')), msg='Missing submodule config "subprojects/c-utf8"')
930
931 url = "gitsm://github.com/CLIUtils/CLI11;protocol=git;rev=bd4dc911847d0cde7a6b41dfa626a85aab213baf"
932 fetcher = bb.fetch.Fetch([url], self.d)
933 fetcher.download()
934 # Previous cwd has been deleted
935 os.chdir(os.path.dirname(self.unpackdir))
936 fetcher.unpack(self.unpackdir)
937 self.assertTrue(os.path.exists(os.path.join(repo_path, '.git/modules/extern/googletest/config')), msg='Missing submodule config "extern/googletest"')
938 self.assertTrue(os.path.exists(os.path.join(repo_path, '.git/modules/extern/json/config')), msg='Missing submodule config "extern/json"')
939 self.assertTrue(os.path.exists(os.path.join(repo_path, '.git/modules/extern/sanitizers/config')), msg='Missing submodule config "extern/sanitizers"')
940
915class TrustedNetworksTest(FetcherTest): 941class TrustedNetworksTest(FetcherTest):
916 def test_trusted_network(self): 942 def test_trusted_network(self):
917 # Ensure trusted_network returns False when the host IS in the list. 943 # Ensure trusted_network returns False when the host IS in the list.