From patchwork Tue Jan 16 11:12:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1887039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=nRobRuEl; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TDmZS3SfPz1ydd for ; Tue, 16 Jan 2024 22:12:48 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6C470385734E for ; Tue, 16 Jan 2024 11:12:46 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 1931A3857C55 for ; Tue, 16 Jan 2024 11:12:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1931A3857C55 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1931A3857C55 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::332 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705403543; cv=none; b=Pr+JA3nHjiqTQQ0MpszMzfyyBDjL55/73r4onqGuFV1yl7tcNF0oYjoDzxgkbOXwS5tQJzgStq/QAGOy/BuN+3Kea6KGT5iJLnUX3oLWuj3jLaa6v7xWm6ESswBjH9G9b2A4pdMS0reUNfE/ak2ZxuG3mVKzp+FAQin8BBhXN+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705403543; c=relaxed/simple; bh=PT5x/ZwBCEuCG72o1/UO07GpVkHEKN0GesvJHyMFM28=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=wWFA7fNnKfRa+mEA0LuI1RLYChT/m2ZUS+1l9oBjmSlrJk94pmO33N6E5zm+3e2UiWMjhhnUOZXN4VcZvOz4jHYuVarjXz/RJeCkJ02LbCdiQZJqUR8nxJby+JNy9QfG5KvWGg+Qcg3nRih3DLNkHzHYQMr1Ze61zvXX2aHzY/I= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40e86a76c56so921645e9.2 for ; Tue, 16 Jan 2024 03:12:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705403535; x=1706008335; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=6KdR7BaRkh2Lwzj3Zt8SBcjDsPrfLL06S94hJF6fVA4=; b=nRobRuElkkAlAKM/qVhBnsyGpwsWfjH/0swWeJO6qAJ5QLDoYdidkGSuav3ymQjpPp X86E5um93FyrkA5hoa5lHAiNyYAXwi6XTHihvWHhws7ZidyfN8ELQauY9HAr97+JU4/J pMd0f8Yk9Mz6ZjvDZ9XhhAq8PKrJ3vjkNZMVj++eDespKZ6wxQS8KIRZTYr6mdnafnoG xxUNhchz6xfD1GCCCtlf5IrF+N13Cjy747tpQYGPA84VHWUcY0Q49/o0ho3NGEP+n9C7 fUKgRX5YYFw9jCt8D+WxheGBtHUSzWM8QCDoiAHLjiLY3ivTanRihkD/dLyFiH6Sn/Z3 pAWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705403535; x=1706008335; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6KdR7BaRkh2Lwzj3Zt8SBcjDsPrfLL06S94hJF6fVA4=; b=cGr6zketshaNNMwm3QO2nNDTjY0b3LVIM/LTD1kQrzz3+SU2dkSdSlm7+XyOCH1htF WNyvLiclN/eGRJyZOrD3YUU3z1PpIAvQiNNHrF0Rrv2j7WSR7lhitkbKnsRTIEGVfMbB /XO5+jle+i1UsUlKlNcEnzfUP2q3+seQw6rqAFCBA1EeqLVKNkLRM5++LBZahPD3VdLY Kqe09NsnKTyiPBsaHgcQJzMG6B6NihVlREsdKrandBJ8QULbbootjSQQwSGRqiVqb/td +lVJvR9L3PP9ahyJ3u0/BD6FHXE3tZupzQ6O14hqcxscIbusCMsSKZIMxucvIVmvI+ei K6Ig== X-Gm-Message-State: AOJu0YztiT68psq2LXc4Rt6VnJN5W4d6x9Mhy3evieyCgFtK4+FTDNs6 8DqTasB7WAqgpEk6HVXPdL8= X-Google-Smtp-Source: AGHT+IHW7bLkzmPe5dNv3xQY00LoYbfis4/68UezVqZ87pnNgEph890BBE8G8tdQpjitBxwQfderkQ== X-Received: by 2002:a05:600c:35cb:b0:40e:7516:2c7b with SMTP id r11-20020a05600c35cb00b0040e75162c7bmr2146410wmq.38.1705403534720; Tue, 16 Jan 2024 03:12:14 -0800 (PST) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id n19-20020a05600c501300b0040e813f1f31sm3293611wmr.25.2024.01.16.03.12.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 16 Jan 2024 03:12:14 -0800 (PST) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: dmalcolm@redhat.com, gcc-patches@gcc.gnu.org Subject: [PATCH] testsuite, jit: Stabilize error output. Date: Tue, 16 Jan 2024 11:12:13 +0000 Message-Id: <20240116111213.42899-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: iain@sandoe.co.uk Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64, i686 Darwin, x86_64 Linux, OK for trunk? When? thanks Iain --- 8< --- Currently when a test fails, we print out a lot of information, this includes items that are not stable between invocations (e.g. the PID for the executable). That makes automated comparisons between test runs flag any persistent fails as new ones each time which is not usually what is wanted. This patch amends the error output to drop the variable portion of the message and retain items that should only change if the failure mode changes. gcc/testsuite/ChangeLog: * jit.dg/jit.exp: Filter error output to remove per-run variable content. Signed-off-by: Iain Sandoe --- gcc/testsuite/jit.dg/jit.exp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/jit.dg/jit.exp b/gcc/testsuite/jit.dg/jit.exp index 286cfa8192a..893ff5f6dd0 100644 --- a/gcc/testsuite/jit.dg/jit.exp +++ b/gcc/testsuite/jit.dg/jit.exp @@ -94,25 +94,34 @@ proc parse_valgrind_logfile {name logfile} { # unexpected exits. proc verify_exit_status { executable wres } { - lassign $wres pid spawnid os_error_flag value + set extra [lassign $wres pid spawnid os_error_flag value] verbose "pid: $pid" 3 verbose "spawnid: $spawnid" 3 verbose "os_error_flag: $os_error_flag" 3 verbose "value: $value" 3 # Detect segfaults etc: - if { [llength $wres] > 4 } { - if { [lindex $wres 4] == "CHILDKILLED" } { - fail "$executable killed: $wres" + set len [llength $extra] + if { $len >= 1 } { + if { [lindex $extra 0] == "CHILDKILLED" } { + set reason "Unknown Reason" + set detail "No Details" + if { $len >= 2 } { + set reason [lindex $extra 1] + if { $len >= 3 } { + set detail [lindex $extra 2] + } + } + fail "$executable killed: $reason $detail" return } } if { $os_error_flag != 0 } { - fail "$executable: OS error: $wres" + fail "$executable: OS error: $os_error_flag $extra" return } if { $value != 0 } { - fail "$executable: non-zero exit code: $wres" + fail "$executable: non-zero exit code: $value $extra" return } pass "$executable exited cleanly"