diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-27 14:43:45 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-27 15:09:18 +0530 |
| commit | fa09b122b00848c685d76ec047c813235c1dfdad (patch) | |
| tree | bea585d2310601fad87e7c89b6c72010a607260d /run_unittests.py | |
| parent | 001cf52c3a10aa4d2b0db5ec008fb5d2160ce23e (diff) | |
| download | meson-fa09b122b00848c685d76ec047c813235c1dfdad.zip meson-fa09b122b00848c685d76ec047c813235c1dfdad.tar.gz meson-fa09b122b00848c685d76ec047c813235c1dfdad.tar.bz2 | |
wrap: Also capture stderr while running quiet_git()
We want to return the stderr if the command failed.
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/run_unittests.py b/run_unittests.py index 91ccf37..416cbb7 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -880,6 +880,11 @@ class AllPlatformTests(BasePlatformTests): def test_always_prefer_c_compiler_for_asm(self): testdir = os.path.join(self.common_test_dir, '141 c cpp and asm') + # Skip if building with MSVC + env = Environment(testdir, self.builddir, self.meson_command, + get_fake_options(self.prefix), []) + if env.detect_c_compiler(False).get_id() == 'msvc': + raise unittest.SkipTest('MSVC can\'t compile assembly') self.init(testdir) commands = {'cpp-asm': {}, 'cpp-c-asm': {}, 'c-cpp-asm': {}} for cmd in self.get_compdb(): |