Skip to content

Reland [mlir] Fix integration test when %host_cc path contains spaces #128542

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

Merged
merged 2 commits into from
Feb 24, 2025

Conversation

Hardcode84
Copy link
Contributor

@Hardcode84 Hardcode84 commented Feb 24, 2025

Reland #128439

Some builders have spaces at the end of the host_cc path.

@Hardcode84 Hardcode84 requested a review from joker-eph February 24, 2025 17:48
@llvmbot llvmbot added the mlir label Feb 24, 2025
@llvmbot
Copy link
Member

llvmbot commented Feb 24, 2025

@llvm/pr-subscribers-mlir-memref

@llvm/pr-subscribers-mlir

Author: Ivan Butygin (Hardcode84)

Changes

Continuation of #128439

Some builders have spaces at the end of the host_cc path, which now breaks.


Full diff: https://github.com/llvm/llvm-project/pull/128542.diff

1 Files Affected:

  • (modified) mlir/test/lit.cfg.py (+2-2)
diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py
index 32b2f8b53d5fa..6222acfafdcdd 100644
--- a/mlir/test/lit.cfg.py
+++ b/mlir/test/lit.cfg.py
@@ -55,8 +55,8 @@
 config.substitutions.append(("%shlibext", config.llvm_shlib_ext))
 config.substitutions.append(("%llvm_src_root", config.llvm_src_root))
 config.substitutions.append(("%mlir_src_root", config.mlir_src_root))
-config.substitutions.append(("%host_cxx", config.host_cxx))
-config.substitutions.append(("%host_cc", config.host_cc))
+config.substitutions.append(("%host_cxx", config.host_cxx.strip()))
+config.substitutions.append(("%host_cc", config.host_cc.strip()))
 
 
 # Searches for a runtime library with the given name and returns the found path.

@Hardcode84 Hardcode84 changed the title [mlir] Strip spaces from host_cxx/host_cc in integration tests [mlir] Strip spaces from host_cxx/host_cc in tests Feb 24, 2025
Continuation of llvm#128439
Some builders have spaces at the end of the host_cc path, which now breaks.
@Hardcode84 Hardcode84 changed the title [mlir] Strip spaces from host_cxx/host_cc in tests Reland [mlir] Fix integration test when %host_cc path contains spaces Feb 24, 2025
Copy link
Collaborator

@joker-eph joker-eph left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Hardcode84 Hardcode84 merged commit 00a0b0b into llvm:main Feb 24, 2025
12 checks passed
@Hardcode84 Hardcode84 deleted the path-strip branch February 24, 2025 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants