diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-08-25 15:14:38 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-08-27 00:13:58 +0000 |
commit | 6f74692ae0fe4fda8a133cc1627c4742331a52c7 (patch) | |
tree | f20ee2603e7e3c168f03e08220d6138ecd7c3bc3 /run_unittests.py | |
parent | 17439fa3e890266efeb0af1880640427be71a2ab (diff) | |
download | meson-6f74692ae0fe4fda8a133cc1627c4742331a52c7.zip meson-6f74692ae0fe4fda8a133cc1627c4742331a52c7.tar.gz meson-6f74692ae0fe4fda8a133cc1627c4742331a52c7.tar.bz2 |
Fix typo when fetching buildtype option for compiler checks
This type happened in https://github.com/mesonbuild/meson/pull/7432
and wasn't noticed because I didn't add a test for it. Rectified now.
If we don't specify the CRT, MSVC will pick /MT by default (!?) and
link to `libcmt.lib`. This actually *breaks* UWP because `libcmt.lib`
is not available by default when building for UWP.
Was noticed here: https://github.com/cisco/libsrtp/pull/505
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/run_unittests.py b/run_unittests.py index 2012542..f336270 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1780,6 +1780,15 @@ class BasePlatformTests(unittest.TestCase): cmds = [l[len(prefix):].split() for l in log if l.startswith(prefix)] return cmds + def get_meson_log_sanitychecks(self): + ''' + Same as above, but for the sanity checks that were run + ''' + log = self.get_meson_log() + prefix = 'Sanity check compiler command line:' + cmds = [l[len(prefix):].split() for l in log if l.startswith(prefix)] + return cmds + def introspect(self, args): if isinstance(args, str): args = [args] @@ -5640,6 +5649,50 @@ class WindowsTests(BasePlatformTests): m = re.search('build qt5core.exe: cpp_LINKER.*Qt5Cored.lib', contents) self.assertIsNotNone(m, msg=contents) + def test_compiler_checks_vscrt(self): + ''' + Test that the correct VS CRT is used when running compiler checks + ''' + # Verify that the `b_vscrt` option is available + env = get_fake_env() + cc = env.detect_c_compiler(MachineChoice.HOST) + if 'b_vscrt' not in cc.base_options: + raise unittest.SkipTest('Compiler does not support setting the VS CRT') + + def sanitycheck_vscrt(vscrt): + checks = self.get_meson_log_sanitychecks() + self.assertTrue(len(checks) > 0) + for check in checks: + self.assertIn(vscrt, check) + + testdir = os.path.join(self.common_test_dir, '1 trivial') + self.init(testdir) + sanitycheck_vscrt('/MDd') + + self.new_builddir() + self.init(testdir, extra_args=['-Dbuildtype=debugoptimized']) + sanitycheck_vscrt('/MD') + + self.new_builddir() + self.init(testdir, extra_args=['-Dbuildtype=release']) + sanitycheck_vscrt('/MD') + + self.new_builddir() + self.init(testdir, extra_args=['-Db_vscrt=md']) + sanitycheck_vscrt('/MD') + + self.new_builddir() + self.init(testdir, extra_args=['-Db_vscrt=mdd']) + sanitycheck_vscrt('/MDd') + + self.new_builddir() + self.init(testdir, extra_args=['-Db_vscrt=mt']) + sanitycheck_vscrt('/MT') + + self.new_builddir() + self.init(testdir, extra_args=['-Db_vscrt=mtd']) + sanitycheck_vscrt('/MTd') + @unittest.skipUnless(is_osx(), "requires Darwin") class DarwinTests(BasePlatformTests): |