diff options
| author |  hlopko <hlopko@google.com> | 2018-04-11 05:59:07 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-11 06:01:01 -0700 |
| commit | 0c254e67ef98944897ba7258a8c37300272cdf52 (patch) | |
| tree | ae74f61a29d9899c87b868599cd164d2bff6a073 /src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java | |
| parent | c381cf17f797f485d7a2df4d085ecbec217c79a9 (diff) | |
Automated rollback of commit 3ab52e63079f1e43cb2c973425f615836a334082.
*** Reason for rollback ***
Breaks exoblaze, and there's a better way how to move forward with this.
*** Original change description ***
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: 192437958
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 25b338d6c7..70fe4e0ee5 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/a.o", cclibrary)); + (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cclib/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/a.o", ccbinary)); + (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/ccbin/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/a.o", cctest)); + (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cctest/cctest/a.o", cctest)); assertThat(compileAction.getArguments()).contains("foobarpiii"); } } |