diff options
| author |  tomlu <tomlu@google.com> | 2018-08-01 12:36:30 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-01 12:37:42 -0700 |
| commit | 2b34b372c9a781735845e7d1fb8655e8852f95a2 (patch) | |
| tree | 92fd02e3e21dd28933e3e0db8fc7a32966c3f94d /src/test | |
| parent | 651797f4c701e8d298266c69381dedaa8fc81784 (diff) | |
Only detect artifact conflicts between targets in current build.
Previously, two successive builds of targets A and B would fail if the two sets had conflicting actions. Now, only fail such builds if the targets from the current build has action conflicts.
RELNOTES: None
PiperOrigin-RevId: 206974011
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/py/bazel/bazel_windows_cpp_test.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/py/bazel/bazel_windows_cpp_test.py b/src/test/py/bazel/bazel_windows_cpp_test.py index 40fe50905c..b4dc5a4d21 100644 --- a/src/test/py/bazel/bazel_windows_cpp_test.py +++ b/src/test/py/bazel/bazel_windows_cpp_test.py @@ -278,8 +278,9 @@ class BazelWindowsCppTest(test_base.TestBase): exit_code, _, stderr = self.RunBazel(['build', '//main:main']) self.AssertExitCode(exit_code, 0, stderr) - # Building //main:other_main after //main:main should fail - exit_code, _, stderr = self.RunBazel(['build', '//main:other_main']) + # Building //main:other_main *and* //main:main should fail + exit_code, _, stderr = self.RunBazel( + ['build', '//main:main', '//main:other_main']) self.AssertExitCode(exit_code, 1, stderr) self.assertIn( 'ERROR: file \'main/A.dll\' is generated by these conflicting ' |