aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-05-18 12:33:22 +0100
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-01 20:21:09 +0000
commit6bab3d40a9b473ee3cfff0b3cc8207cebdeb00ce (patch)
treee7976c0f6b81e034a45ea1b706b7b21dc18a048b
parent7a48f6dfcd7b4fe85b28439146b4b541b9a8381e (diff)
downloadmeson-6bab3d40a9b473ee3cfff0b3cc8207cebdeb00ce.zip
meson-6bab3d40a9b473ee3cfff0b3cc8207cebdeb00ce.tar.gz
meson-6bab3d40a9b473ee3cfff0b3cc8207cebdeb00ce.tar.bz2
Fix assertRebuiltTarget with VS backend
For the VS backend, assertRebuiltTarget() asserts the that target is both recompiled and relinked. This isn't correct for test_rc_depends_files, as changing the rc script's dependencies only causes the executable to be relinked, and not to also have it's source recompiled. assertRebuiltTarget already gets this right for the ninja backend.
-rwxr-xr-xrun_unittests.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py
index d5e0656..ec10833 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -735,9 +735,7 @@ class BasePlatformTests(unittest.TestCase):
self.assertIn('Linking target {}'.format(target), ret)
elif self.backend is Backend.vs:
# Ensure that this target was rebuilt
- clre = re.compile('ClCompile:\n [^\n]*cl[^\n]*' + target, flags=re.IGNORECASE)
linkre = re.compile('Link:\n [^\n]*link[^\n]*' + target, flags=re.IGNORECASE)
- self.assertRegex(ret, clre)
self.assertRegex(ret, linkre)
elif self.backend is Backend.xcode:
raise unittest.SkipTest('Please help us fix this test on the xcode backend')