diff options
| author | Sergey Kartashev <sergei.kartashev@yandex.ru> | 2020-10-29 03:04:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 17:04:11 -0700 |
| commit | c9b7e5bd403971a268530838b25a051ab6310fef (patch) | |
| tree | cf0fe678ab1fcb39e054c0d96ff24287a407487e | |
| parent | 42d6b37423818b70ca9b260da1ff7cff7ac5cfa5 (diff) | |
| download | meson-c9b7e5bd403971a268530838b25a051ab6310fef.zip meson-c9b7e5bd403971a268530838b25a051ab6310fef.tar.gz meson-c9b7e5bd403971a268530838b25a051ab6310fef.tar.bz2 | |
Fix gtest invoking while workdir is set (#7904)
* Fix gtest invoking while workdir is set
* Fix gtest invoking when workdir is not set
* Code style fix
Co-authored-by: Sergey Kartashev <kartashev.sv@mipt.ru>
| -rw-r--r-- | mesonbuild/mtest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index a5c2dda..35cb10a 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -697,10 +697,10 @@ class SingleTestRunner: extra_cmd = [] # type: T.List[str] if self.test.protocol is TestProtocol.GTEST: - gtestname = '{}.xml'.format(self.test.name) + gtestname = self.test.name if self.test.workdir: - gtestname = '{}:{}'.format(self.test.workdir, self.test.name) - extra_cmd.append('--gtest_output=xml:{}'.format(gtestname)) + gtestname = os.path.join(self.test.workdir, self.test.name) + extra_cmd.append('--gtest_output=xml:{}.xml'.format(gtestname)) p = subprocess.Popen(cmd + extra_cmd, stdout=stdout, |