Skip to content

NFC: Report error on dxc --version instead of error on None group #7505

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −0
Open

NFC: Report error on dxc --version instead of error on None group #7505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions tools/clang/test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,13 @@ if config.metal:
# Check supported dxil version
def get_dxil_version():
result = subprocess.run([lit.util.which('dxc', llvm_tools_dir), "--version"], stdout=subprocess.PIPE)
if result.returncode != 0:
raise RuntimeError("dxc --version failed with return code %d" % result.returncode)
output = result.stdout.decode("utf-8")
dxcPat = re.compile(r"(dxcompiler.dll|libdxcompiler.so|libdxcompiler.dylib): (?P<dxcMajor>[0-9]+)\.(?P<dxcMinor>[0-9]+).")
m = dxcPat.search(output)
if not m:
raise RuntimeError("Could not find dxc version in output:\n" + output)
dxcMajor = int(m.group("dxcMajor"))
dxcMinor = int(m.group("dxcMinor"))

Expand Down