Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .azure-pipelines/windows-layout-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ steps:
- script: .\python.bat PC\layout -vv -s "$(Build.SourcesDirectory)" -b "$(Py_OutDir)\$(arch)" -t "$(Build.BinariesDirectory)\layout-tmp-${{ parameters.kind }}-$(arch)" --copy "$(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)" ${{ parameters.extraOpts }} --preset-${{ parameters.kind }} --include-tests
displayName: Create ${{ parameters.kind }} layout

- script: .\python.exe -m test.pythoninfo
workingDirectory: $(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)
displayName: Show layout info (${{ parameters.kind }})
- ${{ if ne(parameters.kind, 'embed') }}:
- script: .\python.exe -m test.pythoninfo
workingDirectory: $(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)
displayName: Show layout info (${{ parameters.kind }})

- ${{ if eq(parameters.kind, 'embed') }}:
- script: echo Skipping test.pythoninfo for embed layout because the embeddable package intentionally omits parts of the standard library used by pythoninfo.
displayName: Show layout info (${{ parameters.kind }})

- ${{ if eq(parameters.fulltest, 'true') }}:
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)"
Expand All @@ -25,4 +30,4 @@ steps:
mergeTestResults: true
testRunTitle: ${{ parameters.kind }}-$(testRunTitle)
platform: $(testRunPlatform)
condition: succeededOrFailed()
condition: and(succeededOrFailed(), exists('$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml'))
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Windows embed-layout Azure jobs no longer fail when collecting ``test.pythoninfo``. The ``wmic`` output is now decoded with the Windows OEM code page returned by ``_winapi.GetOEMCP()``, and the Azure layout pipeline skips the diagnostic step for the embeddable build while publishing test results only when the XML file exists.
Loading