From 82052a3947fe4070a0570decb94373d7215fa437 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 19 Mar 2023 16:06:34 -0700 Subject: [PATCH] test-pselect, test-select: use different ports MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- ChangeLog | 14 ++++++++++++++ tests/test-pselect.c | 1 + tests/test-select.c | 1 + tests/test-select.h | 2 -- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c4494749f..86321dbb06 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 41468684c5..a383f1d1b2 100644 --- a/tests/test-pselect.c +++ b/tests/test-pselect.c @@ -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 d04be58418..b460060351 100644 --- a/tests/test-select.c +++ b/tests/test-select.c @@ -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 afa996f40c..ceeb485471 100644 --- a/tests/test-select.h +++ b/tests/test-select.h @@ -37,8 +37,6 @@ # include #endif -#define TEST_PORT 12345 - typedef int (*select_fn) (int, fd_set *, fd_set *, fd_set *, struct timeval *); -- 2.39.5