From 6bab3d40a9b473ee3cfff0b3cc8207cebdeb00ce Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 18 May 2018 12:33:22 +0100 Subject: 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. --- run_unittests.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'run_unittests.py') 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') -- cgit v1.1