diff options
| author | Matt Galbraith <mattgal@microsoft.com> | 2017-05-09 04:26:08 +0300 |
|---|---|---|
| committer | Matt Galbraith <mattgal@microsoft.com> | 2017-05-12 01:51:28 +0300 |
| commit | 67412b4ff08078580a45318a189da16cb0f1b403 (patch) | |
| tree | e9a0fd2283f6e1817a48e8f64c28159b3c530795 | |
| parent | 358282409f225d5ef3dc3ea8438f64bd5e38bd77 (diff) | |
Changes to support ARM-requeue for UAPAOT testing
| -rw-r--r-- | BuildToolsVersion.txt | 2 | ||||
| -rw-r--r-- | src/upload-tests.proj | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 0a03b353f3..b58e04b1f9 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.0.0-prerelease-01610-02 +2.0.0-prerelease-01611-05
\ No newline at end of file diff --git a/src/upload-tests.proj b/src/upload-tests.proj index 57827f69e4..9b12dea43c 100644 --- a/src/upload-tests.proj +++ b/src/upload-tests.proj @@ -25,6 +25,9 @@ - Command must produce testResults.xml on successful execution. - Command is expressed in terms of an .SH file if on *Nix --> <UseScriptRunner>true</UseScriptRunner> + <!-- For Windows ARM & ARM64 UAPAOT runs, we'll need a special runner that knows how to do this (TODO: Combine the runners) --> + <UseContinuationRunner Condition="'$(ArchGroup)'=='arm' AND '$(TargetGroup)'=='uapaot'">true</UseContinuationRunner> + <SecondaryPayloadDir Condition="'$(ArchGroup)'=='arm' AND '$(TargetGroup)'=='uapaot'">%HELIX_WORKITEM_PAYLOAD%\native</SecondaryPayloadDir> <!-- Test builds consist of the tests that are platform specific in one root, plus others in AnyOS. --> <AnyOSPlatformConfig>AnyOS.AnyCPU.$(ConfigurationGroup)</AnyOSPlatformConfig> |