Skip to content

Commit 446223c

Browse files
authored
Make Windows test step nicer as well (#46332)
1 parent 6929e9b commit 446223c

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,7 @@ jobs:
203203
- ${{ if eq(parameters.targetOS, 'windows') }}:
204204
## Basic arguments
205205
- name: baseArguments
206-
value: -ci -cleanWhileBuilding -prepareMachine /p:VerticalName=$(Agent.JobName) /p:ArtifactsStagingDir=$(artifactsStagingDir)
207-
208-
- name: configArguments
209-
value: -c ${{ parameters.configuration }}
206+
value: -ci -cleanWhileBuilding -prepareMachine -c ${{ parameters.configuration }} /p:VerticalName=$(Agent.JobName) /p:ArtifactsStagingDir=$(artifactsStagingDir)
210207

211208
- name: targetArguments
212209
value: /p:TargetOS=${{ parameters.targetOS }} /p:TargetArchitecture=${{ parameters.targetArchitecture }}
@@ -379,7 +376,6 @@ jobs:
379376

380377
- script: build.cmd
381378
$(baseArguments)
382-
$(configArguments)
383379
$(targetArguments)
384380
$(devArguments)
385381
$(signArguments)
@@ -389,8 +385,15 @@ jobs:
389385
workingDirectory: ${{ variables.sourcesPath }}
390386

391387
- ${{ if eq(parameters.runTests, 'True') }}:
392-
- script: |
393-
call build.cmd -ci -prepareMachine -test -excludeCIBinarylog /bl:artifacts/log/Release/Test.binlog -c ${{ parameters.configuration }} /p:TargetOS=${{ parameters.targetOS }} /p:TargetArchitecture=${{ parameters.targetArchitecture }} /p:VerticalName=$(Agent.JobName) /p:ArtifactsStagingDir=$(artifactsStagingDir) ${{ parameters.extraProperties }}
388+
- script: build.cmd
389+
$(baseArguments)
390+
$(targetArguments)
391+
$(devArguments)
392+
$(buildPassArguments)
393+
${{ parameters.extraProperties }}
394+
-test
395+
-excludeCIBinarylog
396+
/bl:artifacts/log/Release/Test.binlog
394397
displayName: Run Tests
395398
workingDirectory: ${{ variables.sourcesPath }}
396399
timeoutInMinutes: ${{ variables.runTestsTimeout }}

0 commit comments

Comments
 (0)