diff options
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 904ff6988b..6fe145c994 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
@@ -240,6 +240,9 @@ class DevtoolTests(DevtoolBase): | |||
240 | # Check preconditions | 240 | # Check preconditions |
241 | result = runCmd('bitbake-layers show-layers') | 241 | result = runCmd('bitbake-layers show-layers') |
242 | self.assertTrue('\nworkspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf') | 242 | self.assertTrue('\nworkspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf') |
243 | # remove conf/devtool.conf to avoid it corrupting tests | ||
244 | devtoolconf = os.path.join(self.builddir, 'conf', 'devtool.conf') | ||
245 | self.track_for_cleanup(devtoolconf) | ||
243 | # Try creating a workspace layer with a specific path | 246 | # Try creating a workspace layer with a specific path |
244 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 247 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
245 | self.track_for_cleanup(tempdir) | 248 | self.track_for_cleanup(tempdir) |