diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/core/utils/concurrencytest.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/sdkext/testsdk.py | 7 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/signing.py | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0f7b3dcc11..e6b14da89d 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py | |||
@@ -261,7 +261,7 @@ def fork_for_tests(concurrency_num, suite): | |||
261 | oe.path.copytree(selftestdir, newselftestdir) | 261 | oe.path.copytree(selftestdir, newselftestdir) |
262 | 262 | ||
263 | for e in os.environ: | 263 | for e in os.environ: |
264 | if builddir in os.environ[e]: | 264 | if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir): |
265 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) | 265 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) |
266 | 266 | ||
267 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) | 267 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) |
diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py index 785b5dda53..c5c46df6cd 100644 --- a/meta/lib/oeqa/sdkext/testsdk.py +++ b/meta/lib/oeqa/sdkext/testsdk.py | |||
@@ -25,11 +25,8 @@ class TestSDKExt(TestSDKBase): | |||
25 | 25 | ||
26 | subprocesstweak.errors_have_output() | 26 | subprocesstweak.errors_have_output() |
27 | 27 | ||
28 | # extensible sdk can be contaminated if native programs are | 28 | # We need the original PATH for testing the eSDK, not with our manipulations |
29 | # in PATH, i.e. use perl-native instead of eSDK one. | 29 | os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH") |
30 | paths_to_avoid = [d.getVar('STAGING_DIR'), | ||
31 | d.getVar('BASE_WORKDIR')] | ||
32 | os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) | ||
33 | 30 | ||
34 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") | 31 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") |
35 | if not os.path.exists(tcname): | 32 | if not os.path.exists(tcname): |
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 7d3922ce44..d4fea91350 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py | |||
@@ -166,7 +166,7 @@ class TestImage(OESelftestTestCase): | |||
166 | bitbake('core-image-full-cmdline socat') | 166 | bitbake('core-image-full-cmdline socat') |
167 | bitbake('-c testimage core-image-full-cmdline') | 167 | bitbake('-c testimage core-image-full-cmdline') |
168 | 168 | ||
169 | def test_testimage_virgl_gtk(self): | 169 | def disabled_test_testimage_virgl_gtk(self): |
170 | """ | 170 | """ |
171 | Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk frontend | 171 | Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk frontend |
172 | Expected: 1. Check that virgl kernel driver is loaded and 3d acceleration is enabled | 172 | Expected: 1. Check that virgl kernel driver is loaded and 3d acceleration is enabled |
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 5c4e01b2c3..5b8f9bbd38 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py | |||
@@ -44,7 +44,9 @@ class Signing(OESelftestTestCase): | |||
44 | origenv = os.environ.copy() | 44 | origenv = os.environ.copy() |
45 | 45 | ||
46 | for e in os.environ: | 46 | for e in os.environ: |
47 | if builddir in os.environ[e]: | 47 | if builddir + "/" in os.environ[e]: |
48 | os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/") | ||
49 | if os.environ[e].endswith(builddir): | ||
48 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) | 50 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) |
49 | 51 | ||
50 | os.chdir(newbuilddir) | 52 | os.chdir(newbuilddir) |