diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index f512ebc0a0..64179d4004 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
| @@ -8,6 +8,7 @@ import shutil | |||
| 8 | import tempfile | 8 | import tempfile |
| 9 | import glob | 9 | import glob |
| 10 | import fnmatch | 10 | import fnmatch |
| 11 | import unittest | ||
| 11 | 12 | ||
| 12 | from oeqa.selftest.case import OESelftestTestCase | 13 | from oeqa.selftest.case import OESelftestTestCase |
| 13 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer | 14 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer |
| @@ -38,6 +39,13 @@ def setUpModule(): | |||
| 38 | canonical_layerpath = os.path.realpath(canonical_layerpath) + '/' | 39 | canonical_layerpath = os.path.realpath(canonical_layerpath) + '/' |
| 39 | edited_layers.append(layerpath) | 40 | edited_layers.append(layerpath) |
| 40 | oldmetapath = os.path.realpath(layerpath) | 41 | oldmetapath = os.path.realpath(layerpath) |
| 42 | |||
| 43 | # when downloading poky from tar.gz some tests will be skipped (BUG 12389) | ||
| 44 | try: | ||
| 45 | runCmd('git rev-parse --is-inside-work-tree', cwd=canonical_layerpath) | ||
| 46 | except: | ||
| 47 | raise unittest.SkipTest("devtool tests require folder to be a git repo") | ||
| 48 | |||
| 41 | result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath) | 49 | result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath) |
| 42 | oldreporoot = result.output.rstrip() | 50 | oldreporoot = result.output.rstrip() |
| 43 | newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot)) | 51 | newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot)) |
