diff options
| author | Přemek Vysoký <premek.vysoky@microsoft.com> | 2020-07-01 22:40:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 22:40:33 +0300 |
| commit | f6c65039d2a5200fbf73dc88c0230933193625ad (patch) | |
| tree | 5cc565264a4f5b5eeec4e8b9ab7d2cb9cff1cda8 /eng/testing | |
| parent | 60713cb62b4b38fc00167c2a5e7ace762165d519 (diff) | |
Bump Helix SDK with breaking change in XHarness SDK (#38665)
There is a small breaking change in the SDK about how we run the XHarness tool - we are no longer installing the full .NET SDK to install the tool on every agent but rather installing it on the build machine and then shipping it as-is as Helix correlation payload. We then only need the .NET runtime to be installed on the Helix agents saving us bandwidth and cycles
Diffstat (limited to 'eng/testing')
| -rw-r--r-- | eng/testing/WasmRunnerTemplate.sh | 10 | ||||
| -rw-r--r-- | eng/testing/tests.mobile.targets | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh index 6bba445186f..c9272caf8f1 100644 --- a/eng/testing/WasmRunnerTemplate.sh +++ b/eng/testing/WasmRunnerTemplate.sh @@ -6,8 +6,12 @@ cd $EXECUTION_DIR XHARNESS_OUT="$EXECUTION_DIR/xharness-output" -if [ ! -x "$(command -v xharness)" ]; then - HARNESS_RUNNER="dotnet" +if [ ! -z "$XHARNESS_CLI_PATH" ]; then + # When running in CI, we only have the .NET runtime available + # We need to call the XHarness CLI DLL directly via dotnet exec + HARNESS_RUNNER="dotnet exec $XHARNESS_CLI_PATH" +else + HARNESS_RUNNER="dotnet xharness" fi # RunCommands defined in tests.mobile.targets @@ -15,6 +19,6 @@ fi _exitCode=$? -echo "Xharness artifacts: $XHARNESS_OUT" +echo "XHarness artifacts: $XHARNESS_OUT" exit $_exitCode diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 109e8ea1c34..c5e8d064a7b 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -14,7 +14,7 @@ <PropertyGroup Condition="'$(TargetOS)' == 'Browser'"> <!-- We need to set this in order to get extensibility on xunit category traits and other arguments we pass down to xunit via MSBuild properties --> - <RunScriptCommand>$HARNESS_RUNNER xharness wasm test --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js -v --output-directory=$XHARNESS_OUT -- --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand> + <RunScriptCommand>$HARNESS_RUNNER wasm test --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js -v --output-directory=$XHARNESS_OUT -- --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand> </PropertyGroup> <!-- Generate a self-contained app bundle for Android with tests. --> |