diff options
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/signing.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/context.py | 6 |
3 files changed, 9 insertions, 3 deletions
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) |
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index c4eb5d614e..3d3b19c6e8 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py | |||
@@ -280,11 +280,15 @@ class OESelftestTestContextExecutor(OETestContextExecutor): | |||
280 | return rc | 280 | return rc |
281 | 281 | ||
282 | def _signal_clean_handler(self, signum, frame): | 282 | def _signal_clean_handler(self, signum, frame): |
283 | sys.exit(1) | 283 | if self.ourpid == os.getpid(): |
284 | sys.exit(1) | ||
284 | 285 | ||
285 | def run(self, logger, args): | 286 | def run(self, logger, args): |
286 | self._process_args(logger, args) | 287 | self._process_args(logger, args) |
287 | 288 | ||
289 | # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf | ||
290 | # but don't interfer with other processes | ||
291 | self.ourpid = os.getpid() | ||
288 | signal.signal(signal.SIGTERM, self._signal_clean_handler) | 292 | signal.signal(signal.SIGTERM, self._signal_clean_handler) |
289 | 293 | ||
290 | rc = None | 294 | rc = None |