From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <fche@elastic.org>
Received: from elastic.org (elastic.org [96.126.110.187])
 by sourceware.org (Postfix) with ESMTPS id 080A53858404
 for <dwz@sourceware.org>; Wed,  6 Jul 2022 17:25:37 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 080A53858404
Received: from vpn-home.elastic.org ([10.0.0.2] helo=elastic.org)
 by elastic.org with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
 (Exim 4.95) (envelope-from <fche@elastic.org>) id 1o98mO-00018l-JY
 for dwz@sourceware.org; Wed, 06 Jul 2022 17:25:36 +0000
Received: from fche by elastic.org with local (Exim 4.94.2)
 (envelope-from <fche@elastic.org>) id 1o98mO-000C89-4g
 for dwz@sourceware.org; Wed, 06 Jul 2022 13:25:36 -0400
Date: Wed, 6 Jul 2022 13:25:36 -0400
From: "Frank Ch. Eigler" <fche@elastic.org>
To: dwz@sourceware.org
Subject: patch testsuite - verbose logging
Message-ID: <YsXFkJRKnjcg0lxP@elastic.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Spam-Status: No, score=-107.3 required=5.0 tests=BAYES_00, DKIM_SIGNED,
 DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_PASS,
 TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_WELCOMELIST,
 USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
 server2.sourceware.org
X-BeenThere: dwz@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Dwz mailing list <dwz.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/dwz>,
 <mailto:dwz-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/dwz/>
List-Help: <mailto:dwz-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/dwz>,
 <mailto:dwz-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jul 2022 17:25:38 -0000

Hi -

The following patch puts "sh -x" tracing data into the dwz.log file.
Accidentally, this makes debuginfod-involving tests pass, since their
stderr DEBUGINFOD_PRGRESS traffic show up in stdout rather than stderr
(which is recorded as a fail).

diff --git a/testsuite/dwz.tests/dwz-tests.exp b/testsuite/dwz.tests/dwz-tests.exp
index 811767f57918..73fe73716302 100644
--- a/testsuite/dwz.tests/dwz-tests.exp
+++ b/testsuite/dwz.tests/dwz-tests.exp
@@ -116,7 +116,8 @@ foreach test $tests {
     exec mkdir $dir
 
     cd $dir
-    if { [catch { exec sh -e $test } msg] } {
+    if { [catch { exec sh -x -e $test 2>@ stdout } msg] } {
+        verbose -log "$msg"
 	if { [lindex $::errorCode 0] == "CHILDSTATUS" && \
 		 [lindex $::errorCode 2] == 77 } {
 	    unsupported "$test"
@@ -126,6 +127,7 @@ foreach test $tests {
 	    fail "$test"
 	}
     } else {
+        verbose -log "$msg"
 	if { [file exists dwz.info ] } {
 	    set info [exec cat dwz.info]
 	    verbose -log "$test:" 1