aboutsummaryrefslogtreecommitdiff
path: root/posix/tst-spawn5.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2021-08-24 16:15:50 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2021-08-26 17:13:47 -0300
commit6b20880b22d1d0fce7e9f506baa6fe2d5c7fcfdc (patch)
tree626f478d869a5c26a0ae8b97f41b9d387e0e34b8 /posix/tst-spawn5.c
parente814f4b04ee413a7bb3dfa43e74c8fb4abf58359 (diff)
downloadglibc-6b20880b22d1d0fce7e9f506baa6fe2d5c7fcfdc.zip
glibc-6b20880b22d1d0fce7e9f506baa6fe2d5c7fcfdc.tar.gz
glibc-6b20880b22d1d0fce7e9f506baa6fe2d5c7fcfdc.tar.bz2
Use support_open_dev_null_range io/tst-closefrom, misc/tst-close_range, and posix/tst-spawn5 (BZ #28260)
It ensures a continuous range of file descriptor and avoid hitting the RLIMIT_NOFILE. Checked on x86_64-linux-gnu.
Diffstat (limited to 'posix/tst-spawn5.c')
-rw-r--r--posix/tst-spawn5.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/posix/tst-spawn5.c b/posix/tst-spawn5.c
index ac66738..a95199a 100644
--- a/posix/tst-spawn5.c
+++ b/posix/tst-spawn5.c
@@ -48,17 +48,6 @@ static int initial_argv_count;
#define NFDS 100
static int
-open_multiple_temp_files (void)
-{
- /* Check if the temporary file descriptor has no no gaps. */
- int lowfd = xopen ("/dev/null", O_RDONLY, 0600);
- for (int i = 1; i <= NFDS; i++)
- TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600),
- lowfd + i);
- return lowfd;
-}
-
-static int
parse_fd (const char *str)
{
char *endptr;
@@ -185,7 +174,7 @@ spawn_closefrom_test (posix_spawn_file_actions_t *fa, int lowfd, int highfd,
static void
do_test_closefrom (void)
{
- int lowfd = open_multiple_temp_files ();
+ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600);
const int half_fd = lowfd + NFDS / 2;
/* Close half of the descriptors and check result. */