From: Paul Eggert Date: Sun, 19 Mar 2023 23:06:34 +0000 (-0700) Subject: test-pselect, test-select: use different ports X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c010c8f73409e97171f8c8ba75039ad42cfafe56;p=gnulib.git test-pselect, test-select: use different ports I have observed rare and hard-to-reproduce problems with the GNU grep release candidate with ‘make -j5 check’ on Fedora 37 x86-64. One possibility is that test-pselect and test-select interfere with each other somehow when run simultaneously, as they use the same port. Work around this possibility by using different ports from each other, and from test-poll (which also uses 12345). Of course it’d be better if all these tests used system-assigned ports, but I assume that’d take more work. * tests/test-pselect.c, tests/test-select.c (TEST_PORT): New macro. * tests/test-select.h (TEST_PORT): Remove. --- diff --git a/ChangeLog b/ChangeLog index 3358b5268d..3eeafa854d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2023-03-19 Paul Eggert + + test-pselect, test-select: use different ports + I have observed rare and hard-to-reproduce problems with the GNU + grep release candidate with ‘make -j5 check’ on Fedora 37 x86-64. + One possibility is that test-pselect and test-select interfere + with each other somehow when run simultaneously, as they use the + same port. Work around this possibility by using different ports + from each other, and from test-poll (which also uses 12345). + Of course it’d be better if all these tests used system-assigned + ports, but I assume that’d take more work. + * tests/test-pselect.c, tests/test-select.c (TEST_PORT): New macro. + * tests/test-select.h (TEST_PORT): Remove. + 2023-03-17 Bruno Haible vasnprintf: Fix potential failure on OpenBSD. diff --git a/tests/test-pselect.c b/tests/test-pselect.c index 898578bebd..a383f1d1b2 100644 --- a/tests/test-pselect.c +++ b/tests/test-pselect.c @@ -1,5 +1,5 @@ /* Test of pselect() substitute. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ SIGNATURE_CHECK (pselect, int, (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, struct timespec const *restrict, const sigset_t *restrict)); +#define TEST_PORT 12347 #include "test-select.h" static int diff --git a/tests/test-select.c b/tests/test-select.c index 7cca5517a2..b460060351 100644 --- a/tests/test-select.c +++ b/tests/test-select.c @@ -1,5 +1,5 @@ /* Test of select() substitute. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ SIGNATURE_CHECK (select, int, (int, fd_set *, fd_set *, fd_set *, struct timeval *)); +#define TEST_PORT 12346 #include "test-select.h" int diff --git a/tests/test-select.h b/tests/test-select.h index 5c6784169d..83fb655d84 100644 --- a/tests/test-select.h +++ b/tests/test-select.h @@ -1,5 +1,5 @@ /* Test of select() substitute. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,8 +38,6 @@ # include #endif -#define TEST_PORT 12345 - typedef int (*select_fn) (int, fd_set *, fd_set *, fd_set *, struct timeval *);