From: Michael Wallner <mike@php.net>
Date: Mon, 2 Nov 2020 15:14:50 +0000 (+0100)
Subject: suppress output from runtests
X-Git-Tag: 1.1.0-beta1~134
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6878b48009d7b0988017f6d2b33198a01e09673f;p=m6w6%2Flibmemcached

suppress output from runtests
---

diff --git a/test/setup.cpp b/test/setup.cpp
index 9e23ce2b..cfa18e08 100644
--- a/test/setup.cpp
+++ b/test/setup.cpp
@@ -31,8 +31,6 @@ static void sigchld(int, siginfo_t *si, void *) {
 }
 
 static inline void setup_signals() {
-  cout << " - Setting up signals ... ";
-
   struct sigaction sa;
   memset(&sa, 0, sizeof(sa));
   sa.sa_flags = SA_NOCLDSTOP | SA_RESTART | SA_SIGINFO | SA_NODEFER;
@@ -40,8 +38,6 @@ static inline void setup_signals() {
   sa.sa_sigaction = sigchld;
   if (0 > sigaction(SIGCHLD, &sa, nullptr)) {
     perror("sigaction(CHLD)");
-  } else {
-    cout << "done\n";
   }
 }
 
@@ -62,15 +58,11 @@ static inline void setup_signals() {
 static inline void setup_asan(char **argv) {
   const auto set = getenv("ASAN_OPTIONS");
 
-  cout << " - Setting up ASAN ... ";
-
   if (!set || !*set) {
     SET_ENV_EX(asan, "ASAN_OPTIONS", ASAN_OPTIONS, 0);
-    cout << "re-exec\n";
     execvp(argv[0], argv);
     perror("exec()");
   }
-  cout << "done\n";
 }
 #else
 # define setup_asan(a) (void) a
@@ -78,28 +70,18 @@ static inline void setup_asan(char **argv) {
 
 #if LIBMEMCACHED_WITH_SASL_SUPPORT
 static inline void setup_sasl() {
-  cout << " - Setting up SASL ... ";
-
   SET_ENV_EX(sasl_pwdb, "MEMCACHED_SASL_PWDB", LIBMEMCACHED_WITH_SASL_PWDB, 0);
   SET_ENV_EX(sasl_conf, "SASL_CONF_PATH", LIBMEMCACHED_WITH_SASL_CONF, 0);
-
-  cout << "done\n";
 }
 #else
 # define setup_sasl()
 #endif
 
 static inline void setup_random() {
-  cout << " - Setting up RNG ... ";
-
   random_setup();
-
-  cout << "done\n";
 }
 
 int setup(int &, char ***argv) {
-  cout << "Starting " << **argv << " (pid=" << getpid() << ") ... \n";
-
   setup_signals();
   setup_random();
   setup_asan(*argv);