[Support][test] Fix OpenDirectoryAsFileForRead test on AIX and z/OS - #216241
Merged
Conversation
|
@llvm/pr-subscribers-llvm-support Author: Daniel Chen (DanielCChen) ChangesCommit 9c7ba7b ("[AIX][SystemZ][Support] Check if file is dir on Add a Full diff: https://github.com/llvm/llvm-project/pull/216241.diff 1 Files Affected:
diff --git a/llvm/unittests/Support/Path.cpp b/llvm/unittests/Support/Path.cpp
index b63ab426bb080..6e0cf878ac664 100644
--- a/llvm/unittests/Support/Path.cpp
+++ b/llvm/unittests/Support/Path.cpp
@@ -2042,6 +2042,10 @@ TEST_F(FileSystemTest, OpenDirectoryAsFileForRead) {
Expected<fs::file_t> FD = fs::openNativeFileForRead(TestDirectory);
#ifdef _WIN32
EXPECT_EQ(errorToErrorCode(FD.takeError()), errc::is_a_directory);
+#elif defined(_AIX) || defined(__MVS__)
+ // On AIX and z/OS, open() on a directory with O_RDONLY fails immediately
+ // with EISDIR, unlike Linux where open() succeeds and read() returns EISDIR.
+ EXPECT_EQ(errorToErrorCode(FD.takeError()), errc::is_a_directory);
#else
ASSERT_THAT_EXPECTED(FD, Succeeded());
scope_exit Close([&] { fs::closeFile(*FD); });
|
perry-ca
reviewed
Aug 14, 2026
perry-ca
approved these changes
Aug 14, 2026
perry-ca
left a comment
perry-ca
left a comment
Member
There was a problem hiding this comment.
LGTM
@hubert-reinterpretcast had cherry picked the original into llvm 23. You probably need to do the same.
github-project-automation
Bot
moved this from Needs Triage
to Done
in LLVM Release Status
Member
|
/cherry-pick 828d2d7 |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/200/builds/35340 Here is the relevant piece of the build log for the reference |
Member
|
/pull-request #216342 |
zhangweize9-cyber
pushed a commit
to zhangweize9-cyber/llvm-project
that referenced
this pull request
Aug 16, 2026
…lvm#216241) Commit 9c7ba7b ("[AIX][SystemZ][Support] Check if file is dir on open instead of read") moved the `fstat`/`EISDIR` check from `readNativeFile()` to `openNativeFileForRead()` on AIX and z/OS. This means `openNativeFileForRead()` now returns `EISDIR` immediately on those platforms, but the test `FileSystemTest.OpenDirectoryAsFileForRead` was not updated to match, causing it to fail at the `ASSERT_THAT_EXPECTED(FD, Succeeded())` assertion. Add a `#elif defined(_AIX) || defined(__MVS__)` branch to the test that expects the error to be returned from `openNativeFileForRead()` rather than from `readNativeFile()`, consistent with the behavior introduced by that commit.
dyung
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Aug 21, 2026
…lvm#216241) Commit 9c7ba7b ("[AIX][SystemZ][Support] Check if file is dir on open instead of read") moved the `fstat`/`EISDIR` check from `readNativeFile()` to `openNativeFileForRead()` on AIX and z/OS. This means `openNativeFileForRead()` now returns `EISDIR` immediately on those platforms, but the test `FileSystemTest.OpenDirectoryAsFileForRead` was not updated to match, causing it to fail at the `ASSERT_THAT_EXPECTED(FD, Succeeded())` assertion. Add a `#elif defined(_AIX) || defined(__MVS__)` branch to the test that expects the error to be returned from `openNativeFileForRead()` rather than from `readNativeFile()`, consistent with the behavior introduced by that commit. (cherry picked from commit 828d2d7)
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
5 participants
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.
Commit 9c7ba7b ("[AIX][SystemZ][Support] Check if file is dir on
open instead of read") moved the
fstat/EISDIRcheck fromreadNativeFile()toopenNativeFileForRead()on AIX and z/OS. Thismeans
openNativeFileForRead()now returnsEISDIRimmediately on thoseplatforms, but the test
FileSystemTest.OpenDirectoryAsFileForReadwasnot updated to match, causing it to fail at the
ASSERT_THAT_EXPECTED(FD, Succeeded())assertion.Add a
#elif defined(_AIX) || defined(__MVS__)branch to the test thatexpects the error to be returned from
openNativeFileForRead()ratherthan from
readNativeFile(), consistent with the behavior introduced bythat commit.