aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-06-26 12:05:21 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-06-26 12:30:50 +0200
commit5c0202af4b3d588c04bcec7baf05706b21cd7416 (patch)
treeb716158811f494de86285576f5708192045d79b8 /support
parentlibio: Disable vtable validation in case of interposition [BZ #23313] (diff)
downloadglibc-5c0202af4b3d588c04bcec7baf05706b21cd7416.tar.gz
glibc-5c0202af4b3d588c04bcec7baf05706b21cd7416.tar.bz2
glibc-5c0202af4b3d588c04bcec7baf05706b21cd7416.zip
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.
Diffstat (limited to 'support')
-rw-r--r--support/support_test_main.c3
-rw-r--r--support/test-driver.c4
-rw-r--r--support/test-driver.h1
3 files changed, 7 insertions, 1 deletions
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. */
};