wrap: Also capture stderr while running quiet_git()

We want to return the stderr if the command failed.
pull/1505/head
Nirbheek Chauhan 8 years ago
parent 001cf52c3a
commit fa09b122b0
  1. 2
      mesonbuild/wrap/wrap.py
  2. 5
      run_unittests.py

@ -39,7 +39,7 @@ def build_ssl_context():
return ctx
def quiet_git(cmd):
pc = subprocess.Popen(['git'] + cmd, stdout=subprocess.PIPE)
pc = subprocess.Popen(['git'] + cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = pc.communicate()
if pc.returncode != 0:
return False, err

@ -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():

Loading…
Cancel
Save