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

fix update-verify-tests test suite for AIX #108871

Merged
merged 1 commit into from
Sep 17, 2024

Conversation

hnrklssn
Copy link
Member

The diff command on AIX doesn't support the --strip-trailing-cr flag. The internal python implementation does, so execute the tests in the update-verify-tests test suite using the internal shell for compatibility.

The diff command on AIX doesn't support the --strip-trailing-cr flag.
The internal python implementation does, so execute the tests in the
update-verify-tests test suite using the internal shell for
compatibility.
@hnrklssn hnrklssn requested a review from jakeegan September 16, 2024 18:48
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Sep 16, 2024
@llvmbot
Copy link
Member

llvmbot commented Sep 16, 2024

@llvm/pr-subscribers-clang

Author: Henrik G. Olsson (hnrklssn)

Changes

The diff command on AIX doesn't support the --strip-trailing-cr flag. The internal python implementation does, so execute the tests in the update-verify-tests test suite using the internal shell for compatibility.


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

1 Files Affected:

  • (modified) clang/test/utils/update-verify-tests/lit.local.cfg (+3)
diff --git a/clang/test/utils/update-verify-tests/lit.local.cfg b/clang/test/utils/update-verify-tests/lit.local.cfg
index a0b6afccc25010..b0eebf337da5c9 100644
--- a/clang/test/utils/update-verify-tests/lit.local.cfg
+++ b/clang/test/utils/update-verify-tests/lit.local.cfg
@@ -23,3 +23,6 @@ else:
             "%s %s" % (python, shell_quote(script_path)),
         )
     )
+    # AIX 'diff' command doesn't support --strip-trailing-cr, but the internal
+    # python implementation does, so use that for cross platform compatibility
+    config.test_format = lit.formats.ShTest()

Copy link
Member

@jakeegan jakeegan left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the fix!

@hnrklssn hnrklssn merged commit c96ee0f into llvm:main Sep 17, 2024
10 checks passed
@hnrklssn hnrklssn deleted the fix-strip-trailing-cr branch September 17, 2024 01:39
tmsri pushed a commit to tmsri/llvm-project that referenced this pull request Sep 19, 2024
The diff command on AIX doesn't support the --strip-trailing-cr flag.
The internal python implementation does, so execute the tests in the
update-verify-tests test suite using the internal shell for
compatibility.
dpaoliello added a commit that referenced this pull request Oct 23, 2024
Diff on AIX doesn't have all the required features used in tests (see
<#108871> and
<#112997 (comment)>),
so always use the internal shell.
NoumanAmir657 pushed a commit to NoumanAmir657/llvm-project that referenced this pull request Nov 4, 2024
Diff on AIX doesn't have all the required features used in tests (see
<llvm#108871> and
<llvm#112997 (comment)>),
so always use the internal shell.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants