Stop requiring HlslDataDir for execution tests - #8767
Merged
Damyan Pepper (damyanp) merged 3 commits intoAug 13, 2026
Conversation
ExecHLSLTests could only find its data files through the HlslDataDir parameter or an absolute path baked in at build time, pointing into the builder's source tree. Anything running without that tree had to pass HlslDataDir, and omitting it gave a bare 0x80070002. It now looks beside the test binary too, so a copy deployed alongside its data needs nothing else. An explicit HlslDataDir still takes precedence, and build trees still resolve to the source tree, so XML edits apply without a rebuild. Failures now list the paths tried. Drop the now-redundant setting from hcttest.cmd and taef_exec/lit.cfg. Fixes microsoft#7961 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e211a1ad-3bcd-4fbf-a1ce-d8d177660bff
Contributor
There was a problem hiding this comment.
Pull request overview
Enables execution tests to locate data beside the test binary while retaining explicit and source-tree fallbacks.
Changes:
- Adds multi-location test-data resolution with clearer errors.
- Removes redundant
HlslDataDirarguments from test runners.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
utils/hct/hcttest.cmd |
Removes the default data-directory parameter. |
tools/clang/unittests/HLSLExec/HlslExecTestUtils.cpp |
Implements fallback path resolution and diagnostics. |
tools/clang/test/taef_exec/lit.cfg |
Stops supplying the source data path. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+486
to
+487
| std::filesystem::path Candidate = | ||
| std::filesystem::path(OverrideDir) / RelativePath; |
Member
Author
There was a problem hiding this comment.
This was an intentional simplification.
Jesse Natalie (jenatali)
approved these changes
Aug 12, 2026
Jesse Natalie (jenatali)
approved these changes
Aug 12, 2026
Joshua Batista (bob80905)
approved these changes
Aug 13, 2026
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.
ExecHLSLTests could only find its data files through the HlslDataDir parameter or an absolute path baked in at build time, pointing into the builder's source tree. Anything running without that tree had to pass HlslDataDir, and omitting it gave a bare 0x80070002.
It now looks beside the test binary too, so a copy deployed alongside its data needs nothing else. An explicit HlslDataDir still takes precedence, and build trees still resolve to the source tree, so XML edits apply without a rebuild. Failures now list the paths tried.
Drop the now-redundant setting from hcttest.cmd and taef_exec/lit.cfg.
Fixes #7961