From 3ab52e63079f1e43cb2c973425f615836a334082 Mon Sep 17 00:00:00 2001 From: pcloudy Date: Fri, 6 Apr 2018 16:40:48 -0700 Subject: Flip default value of --experimental_shortened_obj_file_path to true RELNOTES: Flip default value of --experimental_shortened_obj_file_path to true, Bazel now generates short object file path by default. PiperOrigin-RevId: 191958480 --- .../java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java') diff --git a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java index 70fe4e0ee5..25b338d6c7 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java @@ -124,7 +124,7 @@ public class ToolchainTypeTest extends BuildViewTestCase { .setList("copts", "foobar$(TARGET_CPU)") .write(); CppCompileAction compileAction = - (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cclib/cclib/a.o", cclibrary)); + (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cclib/a.o", cclibrary)); assertThat(compileAction.getArguments()).contains("foobarpiii"); ConfiguredTarget ccbinary = @@ -133,7 +133,7 @@ public class ToolchainTypeTest extends BuildViewTestCase { .setList("copts", "foobar$(TARGET_CPU)") .write(); compileAction = - (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/ccbin/ccbin/a.o", ccbinary)); + (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/ccbin/a.o", ccbinary)); assertThat(compileAction.getArguments()).contains("foobarpiii"); ConfiguredTarget cctest = @@ -142,7 +142,7 @@ public class ToolchainTypeTest extends BuildViewTestCase { .setList("copts", "foobar$(TARGET_CPU)") .write(); compileAction = - (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cctest/cctest/a.o", cctest)); + (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cctest/a.o", cctest)); assertThat(compileAction.getArguments()).contains("foobarpiii"); } } -- cgit v1.2.3