summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-10-11 16:13:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:03 +0000
commit0fe742674e9a37e7b352065a1b524d37e5a41137 (patch)
treebfaeb9311380e3598fe9a1b083b3d44a67a6c1fb /meta
parenta360fa7d519320faf53065ba9584a426fd275c1a (diff)
downloadpoky-0fe742674e9a37e7b352065a1b524d37e5a41137.tar.gz
devtool: disable creating workspace for extract and search subcommands
For subcommands that don't actually involve the workspace, don't auto-create the workspace. (From OE-Core rev: 90cba7992bc1d227e242666cd486414bd4a45f7e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/devtool.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index dcdef5a14b..0a44ae71c8 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -823,10 +823,10 @@ class DevtoolTests(DevtoolBase):
823 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 823 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
824 # Try devtool extract 824 # Try devtool extract
825 self.track_for_cleanup(tempdir) 825 self.track_for_cleanup(tempdir)
826 self.track_for_cleanup(self.workspacedir)
827 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
828 result = runCmd('devtool extract remake %s' % tempdir) 826 result = runCmd('devtool extract remake %s' % tempdir)
829 self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found') 827 self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found')
828 # devtool extract shouldn't create the workspace
829 self.assertFalse(os.path.exists(self.workspacedir))
830 self._check_src_repo(tempdir) 830 self._check_src_repo(tempdir)
831 831
832 @testcase(1379) 832 @testcase(1379)
@@ -834,10 +834,10 @@ class DevtoolTests(DevtoolBase):
834 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 834 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
835 # Try devtool extract 835 # Try devtool extract
836 self.track_for_cleanup(tempdir) 836 self.track_for_cleanup(tempdir)
837 self.track_for_cleanup(self.workspacedir)
838 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
839 result = runCmd('devtool extract virtual/libx11 %s' % tempdir) 837 result = runCmd('devtool extract virtual/libx11 %s' % tempdir)
840 self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found') 838 self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found')
839 # devtool extract shouldn't create the workspace
840 self.assertFalse(os.path.exists(self.workspacedir))
841 self._check_src_repo(tempdir) 841 self._check_src_repo(tempdir)
842 842
843 @testcase(1168) 843 @testcase(1168)