Use TAEF ignore properties to skip tests for WSL1 / WSL2 based on testpass version property#40459
Open
Use TAEF ignore properties to skip tests for WSL1 / WSL2 based on testpass version property#40459
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the WSL test execution flow to rely on TAEF conditional Ignore properties (driven by the test pass /p:Version run property) instead of injecting version-based /select: filters from the runner scripts/templates.
Changes:
- Remove automatic version filtering (
/select:) fromrun-tests.ps1and shift version gating into the test metadata macros. - Update WSL1/WSL2/WSLC test method macros to use conditional
Ignore[...]properties keyed off@Version. - Simplify CloudTest test group generation by reusing a single
TestGroup.xml.intemplate (and deleting the WSLC-specific template), with per-group${TEST_FILTER}selection.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| tools/test/run-tests.ps1 | Stops injecting automatic version /select: filtering into TE.exe invocation. |
| test/windows/Common.h | Switches version-specific test macros from WSLVersion tagging to conditional Ignore[...] based on @Version. |
| cloudtest/TestGroup.xml.in | Replaces the hardcoded selection query with a configured ${TEST_FILTER}. |
| cloudtest/TestGroup-wslc.xml.in | Removed; WSLC now reuses the common TestGroup template. |
| cloudtest/CMakeLists.txt | Introduces ${TEST_FILTER} per job type and reuses the common TestGroup template for WSLC jobs. |
Comment on lines
50
to
57
| set(version "2") | ||
| set(DIR ${OUT}/${image}-wslc) | ||
| set(TEST_FILTER "(@TestCategory='WSLC')") | ||
|
|
||
| file(MAKE_DIRECTORY ${DIR}) | ||
|
|
||
|
|
||
| configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TestMap.xml.in ${DIR}/TestMap.xml) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of the Pull Request
This change switches from using /select to enable / disable wsl{1, 2} specific cases. Instead we use
ignoreproperties, which make the UX of running tests locally with a custom filter nicer, since wsl tests won't run under the wrong versionPR Checklist
Detailed Description of the Pull Request / Additional comments
Validation Steps Performed