diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2018-04-12 23:05:01 -0300 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@igalia.com> | 2018-04-12 23:07:16 -0300 |
| commit | 55dee0b8a62b6dba4747cfd7f62a708974ad1ab5 (patch) | |
| tree | 850ace0398f100dfedf6c91449ee4b5a1f9ede63 | |
| parent | b9ea96727553a634c151ca3b14dd5d11a1cbfa92 (diff) | |
validate:launcher: Extract method to set a validate configuration on tests
| -rw-r--r-- | validate/launcher/baseclasses.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index d0d2fab..c18a5b0 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -414,14 +414,7 @@ class Test(Loggable): self.timeout *= VALGRIND_TIMEOUT_FACTOR # Enable 'valgrind.config' - vg_config = get_data_file('data', 'valgrind.config') - - if self.proc_env.get('GST_VALIDATE_CONFIG'): - subenv['GST_VALIDATE_CONFIG'] = '%s%s%s' % ( - self.proc_env['GST_VALIDATE_CONFIG'], os.pathsep, vg_config) - else: - subenv['GST_VALIDATE_CONFIG'] = vg_config - + self.add_validate_config(get_data_file('data', 'valgrind.config'), subenv) if subenv == self.proc_env: self.add_env_variable('G_DEBUG', 'gc-friendly') self.add_env_variable('G_SLICE', 'always-malloc') @@ -430,6 +423,16 @@ class Test(Loggable): return command + def add_validate_config(self, config, subenv=None): + if not subenv: + subenv = self.extra_env_variables + + if subenv.get('GST_VALIDATE_CONFIG'): + subenv['GST_VALIDATE_CONFIG'] = '%s%s%s' % ( + self.proc_env['GST_VALIDATE_CONFIG'], os.pathsep, config) + else: + subenv['GST_VALIDATE_CONFIG'] = config + def launch_server(self): return None |