summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 1dfef599e6..3c537ee071 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1073,7 +1073,7 @@ class DevtoolTests(DevtoolBase):
1073 1073
1074 @OETestID(1628) 1074 @OETestID(1628)
1075 def test_devtool_update_recipe_local_files_subdir(self): 1075 def test_devtool_update_recipe_local_files_subdir(self):
1076 # Try devtool extract on a recipe that has a file with subdir= set in 1076 # Try devtool update-recipe on a recipe that has a file with subdir= set in
1077 # SRC_URI such that it overwrites a file that was in an archive that 1077 # SRC_URI such that it overwrites a file that was in an archive that
1078 # was also in SRC_URI 1078 # was also in SRC_URI
1079 # First, modify the recipe 1079 # First, modify the recipe
@@ -1103,10 +1103,10 @@ class DevtoolTests(DevtoolBase):
1103 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 1103 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
1104 # Try devtool extract 1104 # Try devtool extract
1105 self.track_for_cleanup(tempdir) 1105 self.track_for_cleanup(tempdir)
1106 self.track_for_cleanup(self.workspacedir)
1107 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
1106 result = runCmd('devtool extract matchbox-terminal %s' % tempdir) 1108 result = runCmd('devtool extract matchbox-terminal %s' % tempdir)
1107 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found') 1109 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found')
1108 # devtool extract shouldn't create the workspace
1109 self.assertNotExists(self.workspacedir)
1110 self._check_src_repo(tempdir) 1110 self._check_src_repo(tempdir)
1111 1111
1112 @OETestID(1379) 1112 @OETestID(1379)
@@ -1114,10 +1114,10 @@ class DevtoolTests(DevtoolBase):
1114 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 1114 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
1115 # Try devtool extract 1115 # Try devtool extract
1116 self.track_for_cleanup(tempdir) 1116 self.track_for_cleanup(tempdir)
1117 self.track_for_cleanup(self.workspacedir)
1118 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
1117 result = runCmd('devtool extract virtual/make %s' % tempdir) 1119 result = runCmd('devtool extract virtual/make %s' % tempdir)
1118 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found') 1120 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found')
1119 # devtool extract shouldn't create the workspace
1120 self.assertNotExists(self.workspacedir)
1121 self._check_src_repo(tempdir) 1121 self._check_src_repo(tempdir)
1122 1122
1123 @OETestID(1168) 1123 @OETestID(1168)