diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 51949e3c93..5475c029b7 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
| @@ -286,10 +286,13 @@ class DevtoolTestCase(OESelftestTestCase): | |||
| 286 | else: | 286 | else: |
| 287 | self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') | 287 | self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') |
| 288 | 288 | ||
| 289 | def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri): | 289 | def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri, srcrev=None): |
| 290 | self.track_for_cleanup(self.workspacedir) | 290 | self.track_for_cleanup(self.workspacedir) |
| 291 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') | 291 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') |
| 292 | result = runCmd('devtool add --version %s %s %s' % (version, pn, git_url)) | 292 | command = 'devtool add --version %s %s %s' % (version, pn, git_url) |
| 293 | if srcrev : | ||
| 294 | command += ' --srcrev %s' %srcrev | ||
| 295 | result = runCmd(command) | ||
| 293 | self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') | 296 | self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') |
| 294 | # Check the recipe name is correct | 297 | # Check the recipe name is correct |
| 295 | recipefile = get_bb_var('FILE', pn) | 298 | recipefile = get_bb_var('FILE', pn) |
| @@ -479,11 +482,12 @@ class DevtoolAddTests(DevtoolBase): | |||
| 479 | 482 | ||
| 480 | def test_devtool_add_git_style2(self): | 483 | def test_devtool_add_git_style2(self): |
| 481 | version = 'v3.1.0' | 484 | version = 'v3.1.0' |
| 485 | srcrev = 'v3.1.0' | ||
| 482 | pn = 'mbedtls' | 486 | pn = 'mbedtls' |
| 483 | # this will trigger reformat_git_uri with branch parameter in url | 487 | # this will trigger reformat_git_uri with branch parameter in url |
| 484 | git_url = "'git://git@github.com/ARMmbed/mbedtls.git;protocol=https'" | 488 | git_url = "'git://git@github.com/ARMmbed/mbedtls.git;protocol=https'" |
| 485 | resulting_src_uri = "gitsm://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master" | 489 | resulting_src_uri = "gitsm://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master" |
| 486 | self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri) | 490 | self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri, srcrev) |
| 487 | 491 | ||
| 488 | def test_devtool_add_library(self): | 492 | def test_devtool_add_library(self): |
| 489 | # Fetch source | 493 | # Fetch source |
