diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2017-01-06 12:09:13 -0300 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2017-01-06 12:12:21 -0300 |
| commit | de2cbda854de3af218cb9358457a8746e466d23b (patch) | |
| tree | 4d99a17fe3289e1ff6f3c0b992e5f2744010bced | |
| parent | 30221faa32b23f632e6ab54462cff892cc07f52b (diff) | |
validate: Make sure to update children environment from current env
And minor fix in function call
| -rw-r--r-- | validate/launcher/apps/gstcheck.py | 8 | ||||
| -rw-r--r-- | validate/launcher/baseclasses.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/validate/launcher/apps/gstcheck.py b/validate/launcher/apps/gstcheck.py index 23526fceb4..7d3d86ee65 100644 --- a/validate/launcher/apps/gstcheck.py +++ b/validate/launcher/apps/gstcheck.py @@ -31,10 +31,14 @@ from launcher.utils import printc, Colors class MesonTest(Test): def __init__(self, name, options, reporter, test, child_env=None): + ref_env = os.environ if child_env is None: - child_env = dict() + child_env = {} + else: + ref_env.update(child_env) + if not isinstance(test.env, dict): - test.env = test.env.get_env(child_env) + test.env = test.env.get_env(ref_env) child_env.update(test.env) if len(test.extra_paths) > 0: child_env['PATH'] = child_env['PATH'] + \ diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 32097d3c9b..76d45c7c5d 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -255,7 +255,7 @@ class Test(Loggable): if self.process.returncode == 0: self.set_result(Result.PASSED) elif self.process.returncode in [-signal.SIGSEGV, -signal.SIGABRT, 139]: - self.add_stack_trace_to_file() + self.add_stack_trace_to_logfile() self.set_result(Result.FAILED, "Application segfaulted, returne code: %d" % ( self.process.returncode)) |