diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-02-27 20:29:25 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-04 19:08:37 +0200 |
commit | a8da0e25eac650b086c380be6996c908a140a20d (patch) | |
tree | 4d4a919097f6f45b2d70565d0f0acdc2b8f7d45a | |
parent | f53e8b8812d770d60e15c63014dad9bd6bba9bc7 (diff) | |
download | meson-a8da0e25eac650b086c380be6996c908a140a20d.zip meson-a8da0e25eac650b086c380be6996c908a140a20d.tar.gz meson-a8da0e25eac650b086c380be6996c908a140a20d.tar.bz2 |
Skip test that requires mocking when using an external exe. Also logging.
-rwxr-xr-x | run_unittests.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py index b69aaae..6312353 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -526,9 +526,13 @@ class BasePlatformTests(unittest.TestCase): self.privatedir = os.path.join(self.builddir, 'meson-private') if inprocess: try: - (returncode, out, _) = run_configure(self.meson_mainfile, self.meson_args + args + extra_args) + (returncode, out, err) = run_configure(self.meson_mainfile, self.meson_args + args + extra_args) if returncode != 0: self._print_meson_log() + print('Stdout:\n') + print(out) + print('Stderr:\n') + print(err) raise RuntimeError('Configure failed') except: self._print_meson_log() @@ -1774,6 +1778,11 @@ int main(int argc, char **argv) { self._run(ninja, workdir=os.path.join(tmpdir, 'builddir')) + # The test uses mocking and thus requires that + # the current process is the one to run the Meson steps. + # If we are using an external test executable (most commonly + # in Debian autopkgtests) then the mocking won't work. + @unittest.skipIf('MESON_EXE' in os.environ, 'MESON_EXE is defined, can not use mocking.') def test_cross_file_system_paths(self): if is_windows(): raise unittest.SkipTest('system crossfile paths not defined for Windows (yet)') |