Skip to content

Commit b8ab1eb

Browse files
NightOwl888NightOwl888
committed
azure-pipelines.yml: Added tests for .NET Framework x86 (see #258)
1 parent de5251c commit b8ab1eb

4 files changed

+79
-19
lines changed

‎azure-pipelines.yml

+24-5
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,15 @@ stages:
312312
imageName: 'macOS-10.14'
313313
maximumParallelJobs: 7
314314
maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
315-
displayName: 'Test netcoreapp3.1 on'
315+
displayName: 'Test netcoreapp3.1,x64 on'
316316
pool:
317317
vmImage: $(imageName)
318318
steps:
319319
- template: 'build/azure-templates/run-tests-on-os.yml'
320320
parameters:
321321
osName: $(osName)
322322
framework: 'netcoreapp3.1'
323+
vsTestPlatform: 'x64'
323324
testResultsArtifactName: '$(TestResultsArtifactName)'
324325
maximumParallelJobs: $(maximumParallelJobs)
325326
maximumAllowedFailures: $(maximumAllowedFailures)
@@ -343,31 +344,49 @@ stages:
343344
imageName: 'macOS-10.14'
344345
maximumParallelJobs: 7
345346
maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
346-
displayName: 'Test netcoreapp2.1 on'
347+
displayName: 'Test netcoreapp2.1,x64 on'
347348
pool:
348349
vmImage: $(imageName)
349350
steps:
350351
- template: 'build/azure-templates/run-tests-on-os.yml'
351352
parameters:
352353
osName: $(osName)
353354
framework: 'netcoreapp2.1'
355+
vsTestPlatform: 'x64'
354356
testResultsArtifactName: '$(TestResultsArtifactName)'
355357
maximumParallelJobs: $(maximumParallelJobs)
356358
maximumAllowedFailures: $(maximumAllowedFailures)
357359

358-
- job: Test_net48_Windows
360+
- job: Test_net48_Windows_x64
359361
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
360-
displayName: 'Test net48 on Windows'
362+
displayName: 'Test net48,x64 on Windows'
361363
pool:
362364
vmImage: 'windows-2019'
363365
steps:
364366
- template: 'build/azure-templates/run-tests-on-os.yml'
365367
parameters:
366368
osName: 'Windows'
367369
framework: 'net48'
370+
vsTestPlatform: 'x64'
368371
testResultsArtifactName: '$(TestResultsArtifactName)'
369372
maximumParallelJobs: 8
370-
maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
373+
maximumAllowedFailures: 2 # Maximum allowed failures for a successful build
374+
375+
- job: Test_net48_Windows_x86
376+
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
377+
displayName: 'Test net48,x86 on Windows'
378+
pool:
379+
vmImage: 'windows-2019'
380+
steps:
381+
- template: 'build/azure-templates/run-tests-on-os.yml'
382+
parameters:
383+
osName: 'Windows'
384+
framework: 'net48'
385+
vsTestPlatform: 'x86'
386+
testResultsArtifactName: '$(TestResultsArtifactName)'
387+
maximumParallelJobs: 8
388+
maximumAllowedFailures: 5 # Maximum allowed failures for a successful build
389+
371390

372391
- stage: Publish_Stage
373392
displayName: 'Publish Stage:'

‎build/azure-templates/publish-test-results-for-test-projects.yml

+44-6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
# " testProjectName: '$projectName'`n" + `
3535
# " osName: '$`{`{ parameters.osName `}`}'`n" + `
3636
# " framework: '$`{`{ parameters.framework `}`}'`n" + `
37+
# " vsTestPlatform: '$`{`{ parameters.vsTestPlatform `}`}'`n" + `
3738
# " testResultsFormat: '$`{`{ parameters.testResultsFormat `}`}'`n" + `
3839
# " testResultsArtifactName: '$`{`{ parameters.testResultsArtifactName `}`}'`n" + `
3940
# " testResultsFileName: '$`{`{ parameters.testResultsFileName `}`}'`n" + `
@@ -47,6 +48,7 @@
4748
parameters:
4849
osName: '' # The name of the operating system for display purposes.
4950
framework: '' # The target framework to publish.
51+
vsTestPlatform: 'x64' # Target platform architecture used for test execution. Valid values are x86, x64, and ARM.
5052
testResultsFormat: VSTest # Specify the format of the results files you want to publish. The following formats are supported: JUnit, NUnit, VSTest, XUnit, CTest
5153
testResultsArtifactName: 'testresults' # The name of the Azure DevOps build artifact where the test results will be published. Default 'testresults'.
5254
testResultsFileName: 'TestResults.trx' # The name of the file (not path) of the test results. Default 'TestResults.trx'.
@@ -60,6 +62,8 @@ steps:
6062
# }
6163
# }
6264
# EnsureNotNullOrEmpty('${{ parameters.osName }}', 'osName')
65+
# EnsureNotNullOrEmpty('${{ parameters.framework }}', 'framework')
66+
# EnsureNotNullOrEmpty('${{ parameters.vsTestPlatform }}', 'vsTestPlatform')
6367
# EnsureNotNullOrEmpty('${{ parameters.testResultsFormat }}', 'testResultsFormat')
6468
# EnsureNotNullOrEmpty('${{ parameters.testResultsArtifactName }}', 'testResultsArtifactName')
6569
# EnsureNotNullOrEmpty('${{ parameters.testResultsFileName }}', 'testResultsFileName')
@@ -69,8 +73,9 @@ steps:
6973
# Special case: Only supports .NET Standard 2.0
7074
- template: publish-test-results.yml
7175
parameters:
72-
framework: 'netcoreapp2.1' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
7376
testProjectName: 'Lucene.Net.Tests.CodeAnalysis'
77+
framework: 'netcoreapp2.1' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
78+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
7479
osName: '${{ parameters.osName }}'
7580
testResultsFormat: '${{ parameters.testResultsFormat }}'
7681
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
@@ -79,8 +84,9 @@ steps:
7984
# Special case: Only supports .netcoreapp3.1
8085
- template: publish-test-results.yml
8186
parameters:
82-
framework: 'netcoreapp3.1' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
8387
testProjectName: 'Lucene.Net.Tests.Cli'
88+
framework: 'netcoreapp3.1' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
89+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
8490
osName: '${{ parameters.osName }}'
8591
testResultsFormat: '${{ parameters.testResultsFormat }}'
8692
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
@@ -89,8 +95,9 @@ steps:
8995
# Special case: Only supports .net48
9096
- template: publish-test-results.yml
9197
parameters:
92-
framework: 'net48' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
9398
testProjectName: 'Lucene.Net.Tests.Analysis.OpenNLP'
99+
framework: 'net48' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
100+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
94101
osName: '${{ parameters.osName }}'
95102
testResultsFormat: '${{ parameters.testResultsFormat }}'
96103
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
@@ -102,6 +109,7 @@ steps:
102109
testProjectName: 'Lucene.Net.Tests.ICU'
103110
osName: '${{ parameters.osName }}'
104111
framework: '${{ parameters.framework }}'
112+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
105113
testResultsFormat: '${{ parameters.testResultsFormat }}'
106114
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
107115
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -111,6 +119,7 @@ steps:
111119
testProjectName: 'Lucene.Net.Tests._A-D'
112120
osName: '${{ parameters.osName }}'
113121
framework: '${{ parameters.framework }}'
122+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
114123
testResultsFormat: '${{ parameters.testResultsFormat }}'
115124
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
116125
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -120,6 +129,7 @@ steps:
120129
testProjectName: 'Lucene.Net.Tests._E-I'
121130
osName: '${{ parameters.osName }}'
122131
framework: '${{ parameters.framework }}'
132+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
123133
testResultsFormat: '${{ parameters.testResultsFormat }}'
124134
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
125135
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -129,6 +139,7 @@ steps:
129139
testProjectName: 'Lucene.Net.Tests._I-J'
130140
osName: '${{ parameters.osName }}'
131141
framework: '${{ parameters.framework }}'
142+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
132143
testResultsFormat: '${{ parameters.testResultsFormat }}'
133144
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
134145
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -138,6 +149,7 @@ steps:
138149
testProjectName: 'Lucene.Net.Tests._J-S'
139150
osName: '${{ parameters.osName }}'
140151
framework: '${{ parameters.framework }}'
152+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
141153
testResultsFormat: '${{ parameters.testResultsFormat }}'
142154
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
143155
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -147,6 +159,7 @@ steps:
147159
testProjectName: 'Lucene.Net.Tests._T-Z'
148160
osName: '${{ parameters.osName }}'
149161
framework: '${{ parameters.framework }}'
162+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
150163
testResultsFormat: '${{ parameters.testResultsFormat }}'
151164
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
152165
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -156,6 +169,7 @@ steps:
156169
testProjectName: 'Lucene.Net.Tests.Analysis.Common'
157170
osName: '${{ parameters.osName }}'
158171
framework: '${{ parameters.framework }}'
172+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
159173
testResultsFormat: '${{ parameters.testResultsFormat }}'
160174
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
161175
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -165,6 +179,7 @@ steps:
165179
testProjectName: 'Lucene.Net.Tests.Analysis.Kuromoji'
166180
osName: '${{ parameters.osName }}'
167181
framework: '${{ parameters.framework }}'
182+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
168183
testResultsFormat: '${{ parameters.testResultsFormat }}'
169184
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
170185
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -174,6 +189,7 @@ steps:
174189
testProjectName: 'Lucene.Net.Tests.Analysis.Morfologik'
175190
osName: '${{ parameters.osName }}'
176191
framework: '${{ parameters.framework }}'
192+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
177193
testResultsFormat: '${{ parameters.testResultsFormat }}'
178194
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
179195
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -183,6 +199,7 @@ steps:
183199
testProjectName: 'Lucene.Net.Tests.Analysis.Phonetic'
184200
osName: '${{ parameters.osName }}'
185201
framework: '${{ parameters.framework }}'
202+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
186203
testResultsFormat: '${{ parameters.testResultsFormat }}'
187204
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
188205
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -192,6 +209,7 @@ steps:
192209
testProjectName: 'Lucene.Net.Tests.Analysis.SmartCn'
193210
osName: '${{ parameters.osName }}'
194211
framework: '${{ parameters.framework }}'
212+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
195213
testResultsFormat: '${{ parameters.testResultsFormat }}'
196214
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
197215
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -201,6 +219,7 @@ steps:
201219
testProjectName: 'Lucene.Net.Tests.Analysis.Stempel'
202220
osName: '${{ parameters.osName }}'
203221
framework: '${{ parameters.framework }}'
222+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
204223
testResultsFormat: '${{ parameters.testResultsFormat }}'
205224
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
206225
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -210,6 +229,7 @@ steps:
210229
testProjectName: 'Lucene.Net.Tests.Benchmark'
211230
osName: '${{ parameters.osName }}'
212231
framework: '${{ parameters.framework }}'
232+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
213233
testResultsFormat: '${{ parameters.testResultsFormat }}'
214234
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
215235
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -219,6 +239,7 @@ steps:
219239
testProjectName: 'Lucene.Net.Tests.Classification'
220240
osName: '${{ parameters.osName }}'
221241
framework: '${{ parameters.framework }}'
242+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
222243
testResultsFormat: '${{ parameters.testResultsFormat }}'
223244
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
224245
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -228,6 +249,7 @@ steps:
228249
testProjectName: 'Lucene.Net.Tests.Codecs'
229250
osName: '${{ parameters.osName }}'
230251
framework: '${{ parameters.framework }}'
252+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
231253
testResultsFormat: '${{ parameters.testResultsFormat }}'
232254
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
233255
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -237,6 +259,7 @@ steps:
237259
testProjectName: 'Lucene.Net.Tests.Demo'
238260
osName: '${{ parameters.osName }}'
239261
framework: '${{ parameters.framework }}'
262+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
240263
testResultsFormat: '${{ parameters.testResultsFormat }}'
241264
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
242265
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -246,6 +269,7 @@ steps:
246269
testProjectName: 'Lucene.Net.Tests.Expressions'
247270
osName: '${{ parameters.osName }}'
248271
framework: '${{ parameters.framework }}'
272+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
249273
testResultsFormat: '${{ parameters.testResultsFormat }}'
250274
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
251275
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -255,6 +279,7 @@ steps:
255279
testProjectName: 'Lucene.Net.Tests.Facet'
256280
osName: '${{ parameters.osName }}'
257281
framework: '${{ parameters.framework }}'
282+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
258283
testResultsFormat: '${{ parameters.testResultsFormat }}'
259284
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
260285
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -264,6 +289,7 @@ steps:
264289
testProjectName: 'Lucene.Net.Tests.Grouping'
265290
osName: '${{ parameters.osName }}'
266291
framework: '${{ parameters.framework }}'
292+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
267293
testResultsFormat: '${{ parameters.testResultsFormat }}'
268294
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
269295
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -273,6 +299,7 @@ steps:
273299
testProjectName: 'Lucene.Net.Tests.Highlighter'
274300
osName: '${{ parameters.osName }}'
275301
framework: '${{ parameters.framework }}'
302+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
276303
testResultsFormat: '${{ parameters.testResultsFormat }}'
277304
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
278305
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -282,6 +309,7 @@ steps:
282309
testProjectName: 'Lucene.Net.Tests.Join'
283310
osName: '${{ parameters.osName }}'
284311
framework: '${{ parameters.framework }}'
312+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
285313
testResultsFormat: '${{ parameters.testResultsFormat }}'
286314
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
287315
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -291,6 +319,7 @@ steps:
291319
testProjectName: 'Lucene.Net.Tests.Memory'
292320
osName: '${{ parameters.osName }}'
293321
framework: '${{ parameters.framework }}'
322+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
294323
testResultsFormat: '${{ parameters.testResultsFormat }}'
295324
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
296325
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -300,6 +329,7 @@ steps:
300329
testProjectName: 'Lucene.Net.Tests.Misc'
301330
osName: '${{ parameters.osName }}'
302331
framework: '${{ parameters.framework }}'
332+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
303333
testResultsFormat: '${{ parameters.testResultsFormat }}'
304334
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
305335
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -309,6 +339,7 @@ steps:
309339
testProjectName: 'Lucene.Net.Tests.Queries'
310340
osName: '${{ parameters.osName }}'
311341
framework: '${{ parameters.framework }}'
342+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
312343
testResultsFormat: '${{ parameters.testResultsFormat }}'
313344
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
314345
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -318,6 +349,7 @@ steps:
318349
testProjectName: 'Lucene.Net.Tests.QueryParser'
319350
osName: '${{ parameters.osName }}'
320351
framework: '${{ parameters.framework }}'
352+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
321353
testResultsFormat: '${{ parameters.testResultsFormat }}'
322354
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
323355
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -327,6 +359,7 @@ steps:
327359
testProjectName: 'Lucene.Net.Tests.Replicator'
328360
osName: '${{ parameters.osName }}'
329361
framework: '${{ parameters.framework }}'
362+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
330363
testResultsFormat: '${{ parameters.testResultsFormat }}'
331364
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
332365
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -336,6 +369,7 @@ steps:
336369
testProjectName: 'Lucene.Net.Tests.Sandbox'
337370
osName: '${{ parameters.osName }}'
338371
framework: '${{ parameters.framework }}'
372+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
339373
testResultsFormat: '${{ parameters.testResultsFormat }}'
340374
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
341375
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -345,6 +379,7 @@ steps:
345379
testProjectName: 'Lucene.Net.Tests.Spatial'
346380
osName: '${{ parameters.osName }}'
347381
framework: '${{ parameters.framework }}'
382+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
348383
testResultsFormat: '${{ parameters.testResultsFormat }}'
349384
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
350385
testResultsFileName: '${{ parameters.testResultsFileName }}'
@@ -354,24 +389,27 @@ steps:
354389
testProjectName: 'Lucene.Net.Tests.Suggest'
355390
osName: '${{ parameters.osName }}'
356391
framework: '${{ parameters.framework }}'
392+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
357393
testResultsFormat: '${{ parameters.testResultsFormat }}'
358394
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
359395
testResultsFileName: '${{ parameters.testResultsFileName }}'
360396

361397
- template: publish-test-results.yml
362398
parameters:
363-
testProjectName: 'Lucene.Net.Tests.TestFramework'
399+
testProjectName: 'Lucene.Net.Tests.TestFramework.DependencyInjection'
364400
osName: '${{ parameters.osName }}'
365401
framework: '${{ parameters.framework }}'
402+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
366403
testResultsFormat: '${{ parameters.testResultsFormat }}'
367404
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
368405
testResultsFileName: '${{ parameters.testResultsFileName }}'
369406

370407
- template: publish-test-results.yml
371408
parameters:
372-
testProjectName: 'Lucene.Net.Tests.TestFramework.DependencyInjection'
409+
testProjectName: 'Lucene.Net.Tests.TestFramework'
373410
osName: '${{ parameters.osName }}'
374411
framework: '${{ parameters.framework }}'
412+
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
375413
testResultsFormat: '${{ parameters.testResultsFormat }}'
376414
testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
377-
testResultsFileName: '${{ parameters.testResultsFileName }}'
415+
testResultsFileName: '${{ parameters.testResultsFileName }}'

0 commit comments

Comments
 (0)