diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java index 2add337eb1..fdd3418040 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java @@ -932,18 +932,18 @@ public class BuildViewTest extends BuildViewTestBase { } useConfiguration("--cpu=k8"); reporter.removeHandler(failFastHandler); // Expect errors from action conflicts. - scratch.file("conflict/BUILD", + scratch.file( + "conflict/BUILD", "config_setting(name = 'a', values = {'test_arg': 'a'})", "cc_library(name='x', srcs=select({':a': ['a.cc'], '//conditions:default': ['foo.cc']}))", - "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])"); - AnalysisResult result = update( - defaultFlags().with(Flag.KEEP_GOING), - "//conflict:_objs/x/conflict/foo.pic.o", - "//conflict:x"); + "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])"); + AnalysisResult result = + update( + defaultFlags().with(Flag.KEEP_GOING), "//conflict:_objs/x/foo.pic.o", "//conflict:x"); assertThat(result.hasError()).isTrue(); // Expect to reach this line without a Precondition-triggered NullPointerException. assertContainsEvent( - "file 'conflict/_objs/x/conflict/foo.pic.o' is generated by these conflicting actions"); + "file 'conflict/_objs/x/foo.pic.o' is generated by these conflicting actions"); } @Test |