This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH COMMITTED] support: Add TEST_NO_SETVBUF
- From: fweimer at redhat dot com (Florian Weimer)
- To: libc-alpha at sourceware dot org
- Date: Tue, 26 Jun 2018 12:31:42 +0200
- Subject: [PATCH COMMITTED] support: Add TEST_NO_SETVBUF
This is sometimes needed for testing stdio streams, where the
setvbuf call in the test driver could interfere with the test.
2018-06-26 Florian Weimer <fweimer@redhat.com>
* support/support_test_main.c (support_test_main): Only call
setvbuf if not disables.
* support/test-driver.c (main): Check TEST_NO_SETVBUF.
* support/test-driver.h (struct test_config): Add no_setvbuf member.
diff --git a/support/support_test_main.c b/support/support_test_main.c
index 396385729b..23429779ac 100644
--- a/support/support_test_main.c
+++ b/support/support_test_main.c
@@ -270,7 +270,8 @@ support_test_main (int argc, char **argv, const struct test_config *config)
timeout = DEFAULT_TIMEOUT;
/* Make sure we see all message, even those on stdout. */
- setvbuf (stdout, NULL, _IONBF, 0);
+ if (!config->no_setvbuf)
+ setvbuf (stdout, NULL, _IONBF, 0);
/* Make sure temporary files are deleted. */
if (support_delete_temp_files != NULL)
diff --git a/support/test-driver.c b/support/test-driver.c
index 09c8783e4f..9798f16227 100644
--- a/support/test-driver.c
+++ b/support/test-driver.c
@@ -140,6 +140,10 @@ main (int argc, char **argv)
test_config.no_mallopt = 1;
#endif
+#ifdef TEST_NO_SETVBUF
+ test_config.no_setvbuf = 1;
+#endif
+
#ifdef TIMEOUT
test_config.timeout = TIMEOUT;
#endif
diff --git a/support/test-driver.h b/support/test-driver.h
index 1708d68d60..549179b254 100644
--- a/support/test-driver.h
+++ b/support/test-driver.h
@@ -35,6 +35,7 @@ struct test_config
int expected_status; /* Expected exit status. */
int expected_signal; /* If non-zero, expect termination by signal. */
char no_mallopt; /* Boolean flag to disable mallopt. */
+ char no_setvbuf; /* Boolean flag to disable setvbuf. */
const char *optstring; /* Short command line options. */
};