From 7922ce0d0df109095cbbe129b37ffbc4be2abd2f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 6 Jan 2024 00:11:18 +0000 Subject: [PATCH] [RESTRICT AUTOMERGE] fcntl_F_SETFD test: allow both Android 14 and 2024Q1 behavior. What's important is that we name the flag. It doesn't really matter whether you have the better message that will be in Android 15. As long as 2024Q1 is using Android 14's CTS, Android 14's CTS needs to work with both. Bug: http://b/307680874 Test: treehugger Change-Id: I8c50707e1dfd6b40e6ced887ae105508c6339989 --- tests/fcntl_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); }