From 6c7da6f203a292787d0172fc6ec2eb735702ebd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 18 Aug 2020 17:32:56 +0200 Subject: [PATCH] Fix duplicate --runtime-path in generated helix command (#40975) While looking at some helix debug logs I noticed we pass the `--runtime-path` option twice: ``` Executed on dci-mac-build-083.local + ./RunTests.sh --runtime-path /tmp/helix/working/A68F0925/p --runtime-path /tmp/helix/working/A68F0925/p ``` Looks like this was an oversight from https://github.com/dotnet/runtime/pull/35606, it's harmless but I thought I'd clean it up :) --- src/libraries/sendtohelixhelp.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index fecc281..569f3bf 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -135,9 +135,9 @@ We "exit /b" at the end of RunTests.cmd. Helix runs some other commands after ours within the batch script, so if we don't use "call", then we cause the parent script to exit, and anything after will not be executed. --> - call RunTests.cmd --runtime-path %HELIX_CORRELATION_PAYLOAD% + call RunTests.cmd $(HelixCommand) --runtime-path %HELIX_CORRELATION_PAYLOAD% - ./RunTests.sh --runtime-path "$HELIX_CORRELATION_PAYLOAD" + ./RunTests.sh $(HelixCommand) --runtime-path "$HELIX_CORRELATION_PAYLOAD" -- 2.7.4