From f7a76173e4d3870860e20a5445206e2eb309e088 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 11 Sep 2020 10:26:49 -0700
Subject: [PATCH] Re-enable Helix tests for signalR java client (#25783)

* Re-enable Helix tests for signalR java client

* Change path to test results
---
 .../java/signalr/test/signalr.client.java.Tests.javaproj | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
index a3f8bee075..3962aeb47b 100644
--- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
+++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
@@ -6,8 +6,6 @@
     <IsTestProject>true</IsTestProject>
     <!-- Installing Java on ARM will take some work -->
     <SkipHelixArm>true</SkipHelixArm>
-    <!-- Skipping on Helix for now -->
-    <BuildHelixPayload>false</BuildHelixPayload>
     <PublishDir>$(OutputPath)</PublishDir>
     <TestDependsOnJava>true</TestDependsOnJava>
   </PropertyGroup>
@@ -37,8 +35,7 @@
       <Files Include="../**/gradle-wrapper.jar" />
       <Files Include="../**/gradle-wrapper.properties" />
       <Files Include="../gradlew" />
-      <Files Include="build.gradle" />
-      <Files Include="../build.gradle" />
+      <Files Include="../**/build.gradle" />
       <Files Include="../gradlew.bat" />
       <Files Include="../settings.gradle" />
       <Files Include="@(Content)" />
@@ -52,8 +49,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' != 'true'" Include="cp %24{HELIX_WORKITEM_ROOT}/test-results/TEST-junit-jupiter.xml %24{HELIX_WORKITEM_ROOT}/junit-results.xml" />
-    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="copy %25HELIX_WORKITEM_ROOT%25\test-results\TEST-junit-jupiter.xml %25HELIX_WORKITEM_ROOT%25\junit-results.xml" />
+    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' != 'true'" Include="cp %24{HELIX_WORKITEM_ROOT}/test/test-results/TEST-junit-jupiter.xml %24{HELIX_WORKITEM_ROOT}/junit-results.xml" />
+    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="copy %25HELIX_WORKITEM_ROOT%25\test\test-results\TEST-junit-jupiter.xml %25HELIX_WORKITEM_ROOT%25\junit-results.xml" />
   </ItemGroup>
 
 </Project>