diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/devtool.py | 2 | ||||
| -rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 2e4b6dada3..fe9f7f77a4 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py | |||
| @@ -301,6 +301,7 @@ class DevtoolTests(DevtoolBase): | |||
| 301 | result = runCmd('devtool add %s %s -f %s' % (testrecipe, srcdir, url)) | 301 | result = runCmd('devtool add %s %s -f %s' % (testrecipe, srcdir, url)) |
| 302 | self.assertTrue(os.path.exists(os.path.join(self.workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created. %s' % result.output) | 302 | self.assertTrue(os.path.exists(os.path.join(self.workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created. %s' % result.output) |
| 303 | self.assertTrue(os.path.isfile(os.path.join(srcdir, 'setup.py')), 'Unable to find setup.py in source directory') | 303 | self.assertTrue(os.path.isfile(os.path.join(srcdir, 'setup.py')), 'Unable to find setup.py in source directory') |
| 304 | self.assertTrue(os.path.isdir(os.path.join(srcdir, '.git')), 'git repository for external source tree was not created') | ||
| 304 | # Test devtool status | 305 | # Test devtool status |
| 305 | result = runCmd('devtool status') | 306 | result = runCmd('devtool status') |
| 306 | self.assertIn(testrecipe, result.output) | 307 | self.assertIn(testrecipe, result.output) |
| @@ -394,6 +395,7 @@ class DevtoolTests(DevtoolBase): | |||
| 394 | result = runCmd('devtool add %s' % url) | 395 | result = runCmd('devtool add %s' % url) |
| 395 | self.assertTrue(os.path.exists(os.path.join(self.workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created. %s' % result.output) | 396 | self.assertTrue(os.path.exists(os.path.join(self.workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created. %s' % result.output) |
| 396 | self.assertTrue(os.path.isfile(os.path.join(srcdir, 'configure')), 'Unable to find configure script in source directory') | 397 | self.assertTrue(os.path.isfile(os.path.join(srcdir, 'configure')), 'Unable to find configure script in source directory') |
| 398 | self.assertTrue(os.path.isdir(os.path.join(srcdir, '.git')), 'git repository for external source tree was not created') | ||
| 397 | # Test devtool status | 399 | # Test devtool status |
| 398 | result = runCmd('devtool status') | 400 | result = runCmd('devtool status') |
| 399 | self.assertIn(testrecipe, result.output) | 401 | self.assertIn(testrecipe, result.output) |
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 9ac2ad57a8..f3f3e98d2f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
| @@ -205,7 +205,7 @@ def add(args, config, basepath, workspace): | |||
| 205 | for fn in os.listdir(recipedir): | 205 | for fn in os.listdir(recipedir): |
| 206 | _add_md5(config, recipename, os.path.join(recipedir, fn)) | 206 | _add_md5(config, recipename, os.path.join(recipedir, fn)) |
| 207 | 207 | ||
| 208 | if args.fetch and not args.no_git: | 208 | if args.fetchuri and not args.no_git: |
| 209 | setup_git_repo(srctree, args.version, 'devtool') | 209 | setup_git_repo(srctree, args.version, 'devtool') |
| 210 | 210 | ||
| 211 | initial_rev = None | 211 | initial_rev = None |
