diff options
author | Elliott Hughes <enh@google.com> | 2024-01-09 15:12:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-09 15:12:13 +0000 |
commit | 99ce83666e5481f82ec342827fdda9e83cb9ce5f (patch) | |
tree | 78457fe032de923b687af0ab0904d3c2e8f26aa1 | |
parent | 8c3c1cd785e252c6f16b19cb98203dcdd49fcbf8 (diff) | |
parent | 7922ce0d0df109095cbbe129b37ffbc4be2abd2f (diff) | |
download | bionic-99ce83666e5481f82ec342827fdda9e83cb9ce5f.tar.gz |
[RESTRICT AUTOMERGE] fcntl_F_SETFD test: allow both Android 14 and 2024Q1 behavior. am: 7922ce0d0d
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2898796
Change-Id: Id9eea3e40c29773a89479bc1101f674225396fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/fcntl_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fcntl_test.cpp b/tests/fcntl_test.cpp index 862f49850..f9bfb3017 100644 --- a/tests/fcntl_test.cpp +++ b/tests/fcntl_test.cpp @@ -361,5 +361,5 @@ TEST(fcntl, open_O_TMPFILE_mode) { } TEST(fcntl_DeathTest, fcntl_F_SETFD) { - EXPECT_DEATH(fcntl(0, F_SETFD, O_NONBLOCK), "non-FD_CLOEXEC"); + EXPECT_DEATH(fcntl(0, F_SETFD, O_NONBLOCK), "FD_CLOEXEC"); } |