diff options
| author | Parker Bibus <parkerbibus@microsoft.com> | 2022-08-09 18:15:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 18:15:57 +0300 |
| commit | b8554beea57afb5d75c55c8ea19ec9965b8917fe (patch) | |
| tree | 484b805e02d2b853d985918e1e0cf2631b9d87c1 /eng/testing | |
| parent | 8020c89b1ea5fdf95253341fbce80323c80dd272 (diff) | |
[PERF] Fix "x$PERF_PREREQS_INSTALLED was unexpected at this time" Error for Microbenchmarks (#73584)
* Try double brackets.
* Only use the bash check if running on non-windows machine, added command for running on windows machines.
* Undoing changes to if statement brackets (double to single now) as the double bracket is not necessary.
* Use the correct, previously removed command.
Diffstat (limited to 'eng/testing')
| -rw-r--r-- | eng/testing/performance/microbenchmarks.proj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eng/testing/performance/microbenchmarks.proj b/eng/testing/performance/microbenchmarks.proj index 2f012348302..1331e1e7a81 100644 --- a/eng/testing/performance/microbenchmarks.proj +++ b/eng/testing/performance/microbenchmarks.proj @@ -131,12 +131,13 @@ <HelixWorkItem Include="@(Partition)"> <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands> - <Command> + <Command Condition="'$(AGENT_OS)' != 'Windows_NT'"> if [ "x$PERF_PREREQS_INSTALLED" = "x1" ]; then $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"; else echo "\n\n** Error: Failed to install prerequisites **\n\n"; export _commandExitCode=1; fi</Command> + <Command Condition="'$(AGENT_OS)' == 'Windows_NT'">$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command> <PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(PERFLAB_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)</PostCommands> <Timeout>$(WorkItemTimeout)</Timeout> </HelixWorkItem> @@ -146,12 +147,13 @@ <HelixWorkItem Include="$(BuildConfig).WorkItem"> <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"</PreCommands> - <Command> + <Command Condition="'$(AGENT_OS)' != 'Windows_NT'"> if [ "x$PERF_PREREQS_INSTALLED" = "x1" ]; then $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"; else echo "\n\n** Error: Failed to install prerequisites **\n\n"; export _commandExitCode=1; fi</Command> + <Command Condition="'$(AGENT_OS)' == 'Windows_NT'">$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"</Command> <PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(PERFLAB_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)</PostCommands> <Timeout>4:00</Timeout> </HelixWorkItem> |