Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include TestConfig.h only if DEFAULT_TEST_DIR is not already defined #4884

Merged
merged 1 commit into from
Dec 15, 2022

Conversation

hekota
Copy link
Member

@hekota hekota commented Dec 15, 2022

TestConfig.h is not available in HLK test build. This change enables skipping of the include.

TestConfig.h is not available in HLK test build.
This change enables skipping of the include.
@hekota hekota enabled auto-merge (squash) December 15, 2022 02:11
@AppVeyorBot
Copy link

@hekota hekota merged commit e7aac8e into microsoft:main Dec 15, 2022
hekota added a commit to hekota/DirectXShaderCompiler that referenced this pull request Dec 16, 2022
…ft#4884)

TestConfig.h is not available in HLK test build.
This change enables skipping of the include.

(cherry picked from commit e7aac8e)
hekota added a commit that referenced this pull request Dec 16, 2022
Cherry-pick of PIX and HLK changes for the 2212 release

Changes for PIX:
20bb3d0 PIX: Modify root sigs in place (plus fix root sig memory leak) (PIX: Modify root sigs in place (plus fix root sig memory leak) #4876)
2c3d965 dxcopt: Support full container and restore extra data to module (dxcopt: Support full container and restore extra data to module #4845)
21cf36a Fix hitgroup metadata argument order

HLK Test Updates:
ee0994e add barycentrics ordering check onto existing barycentrics test (add barycentrics ordering check onto existing barycentrics test #4635)
6acd11b ConvertFloat32ToFloat16: Use DirectXMath conversion functions (ConvertFloat32ToFloat16: Use DirectXMath conversion functions #4855)
e7aac8e Include TestConfig.h only if DEFAULT_TEST_DIR is not defined (Include TestConfig.h only if DEFAULT_TEST_DIR is not already defined #4884)
5decc4a Do not include TestConfig.h for all HLK build (Do not include TestConfig.h for all HLK build #4887)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants