aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-02-21 21:11:26 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2017-07-17 19:20:00 +0300
commita27b4c4640c3b5a16b7aed947fd6258b7f736791 (patch)
tree6c2dfcd7671bfcd72ba95af8e85a1d71ae2012ef
parentafdaedea01e372ab783477e6f2ce0ca81797be07 (diff)
downloadmeson-a27b4c4640c3b5a16b7aed947fd6258b7f736791.zip
meson-a27b4c4640c3b5a16b7aed947fd6258b7f736791.tar.gz
meson-a27b4c4640c3b5a16b7aed947fd6258b7f736791.tar.bz2
unittests: Don't pass /nologo to `cl` during detection
This causes it to not output the version information to stderr, which we need to extract the version and the architecture. Found by Jussi.
-rwxr-xr-xrun_unittests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py
index a6448ba..cc034c3 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1017,7 +1017,7 @@ class AllPlatformTests(BasePlatformTests):
# exelist + some argument. This is meant to test that setting
# something like `ccache gcc -pipe` or `distcc ccache gcc` works.
wrapper = os.path.join(testdir, 'compiler wrapper.py')
- wrappercc = [sys.executable, wrapper] + cc.get_exelist() + cc.get_always_args()
+ wrappercc = [sys.executable, wrapper] + cc.get_exelist() + ['-DSOME_ARG']
wrappercc_s = ''
for w in wrappercc:
wrappercc_s += shlex.quote(w) + ' '