From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 6 Dec 2022 16:26:13 +0000 (+0100)
Subject: runtests: silence nghttpx errors
X-Git-Tag: curl-7_87_0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42bcca4af08117f8f60a084f566d541bce8ea1b0;p=thirdparty%2Fcurl.git

runtests: silence nghttpx errors

Also, move the output of the nghttpx_h3 info to the general "Env:" line
in the test output header.

Reported-by: Marcel Raad
Ref: https://github.com/curl/curl/commit/ca15b7512e8d1199e55fbaa206ef01e64b8f147d#commitcomment-92015094
Closes #10044
---

diff --git a/tests/runtests.pl b/tests/runtests.pl
index b40b21d728..c6a739eca1 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -459,7 +459,7 @@ if (!$ENV{"NGHTTPX"}) {
 if ($ENV{"NGHTTPX"}) {
     my $nghttpx_version=join(' ', runclientoutput("$ENV{'NGHTTPX'} -v"));
     $nghttpx_h3 = $nghttpx_version =~ /nghttp3\//;
-    logmsg "nghttpx_h3=$nghttpx_h3, output=$nghttpx_version\n";
+    chomp $nghttpx_h3;
 }
 
 
@@ -663,7 +663,7 @@ sub runclient {
 #
 sub runclientoutput {
     my ($cmd)=@_;
-    return `$cmd`;
+    return `$cmd 2>/dev/null`;
 
 # This is one way to test curl on a remote machine
 #    my @out = `ssh $CLIENTIP cd \'$pwd\' \\; \'$cmd\'`;
@@ -3458,8 +3458,9 @@ sub checksystem {
     logmsg sprintf("%s", $http_unix?"HTTP-unix ":"");
     logmsg sprintf("%s\n", $ftp_ipv6?"FTP-IPv6 ":"");
 
-    logmsg sprintf("* Env: %s%s", $valgrind?"Valgrind ":"",
-                   $run_event_based?"event-based ":"");
+    logmsg sprintf("* Env: %s%s%s", $valgrind?"Valgrind ":"",
+                   $run_event_based?"event-based ":"",
+                   $nghttpx_h3);
     logmsg sprintf("%s\n", $libtool?"Libtool ":"");
     logmsg ("* Seed: $randseed\n");