aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
diff options
context:
space:
mode:
authorGravatar hlopko <hlopko@google.com>2018-04-11 05:59:07 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-04-11 06:01:01 -0700
commit0c254e67ef98944897ba7258a8c37300272cdf52 (patch)
treeae74f61a29d9899c87b868599cd164d2bff6a073 /src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
parentc381cf17f797f485d7a2df4d085ecbec217c79a9 (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/cpp/CppLinkActionTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
index 556a15690e..beb473470b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
@@ -253,7 +253,7 @@ public class CppLinkActionTest extends BuildViewTestCase {
configuredTarget = getConfiguredTarget("//x:b");
linkAction = (CppLinkAction) getGeneratingAction(configuredTarget, "x/b" + extension);
- assertThat(artifactsToStrings(linkAction.getInputs())).contains("bin x/_objs/b/a.pic.o");
+ assertThat(artifactsToStrings(linkAction.getInputs())).contains("bin x/_objs/b/x/a.pic.o");
runfilesProvider = configuredTarget.getProvider(RunfilesProvider.class);
assertThat(artifactsToStrings(runfilesProvider.getDefaultRunfiles().getArtifacts()))
.containsExactly("bin x/b");