Include .dwp file in the runfiles for cc_test when building with Fission.

--
MOS_MIGRATED_REVID=113660258

2 files changed, 19 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL
index 05e61fbf16..60bbf2b2d0 100644
--- a/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL
+++ b/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL
@@ -46,6 +46,7 @@ toolchain {
   tool_path { name: "strip" path: "/usr/bin/strip" }
 
   needsPic: true
+  supports_fission: true
 
   builtin_sysroot: ""
   cxx_flag: "-std=c++0x"
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonConfiguredTargetTest.java
index 080442e6dd..c6eda4086c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonConfiguredTargetTest.java
@@ -475,6 +475,24 @@ public class CcCommonConfiguredTargetTest extends BuildViewTestCase {
   }
 
   @Test
+  public void testCcTestBuiltWithFissionHasDwp() throws Exception {
+    // Tests that cc_tests built statically and with Fission will have the .dwp file
+    // in their runfiles.
+
+    useConfiguration("--build_test_dwp", "--dynamic_mode=off", "--linkopt=-static",
+        "--fission=yes");
+    ConfiguredTarget target =
+        scratchConfiguredTarget(
+            "mypackage",
+            "mytest",
+            "cc_test(name = 'mytest', ",
+            "         srcs = ['mytest.cc'])");
+
+    Iterable<Artifact> runfiles = collectRunfiles(target);
+    assertThat(baseArtifactNames(runfiles)).contains("mytest.dwp");
+  }
+
+  @Test
   public void testCcLibraryBadIncludesWarnedAndIgnored() throws Exception {
     checkWarning(
         "badincludes",