From patchwork Mon Mar 11 20:57:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 87055 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3992A38582BB for ; Mon, 11 Mar 2024 20:59:51 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 480BD3858CD1; Mon, 11 Mar 2024 20:58:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 480BD3858CD1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 480BD3858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710190698; cv=none; b=B/eD4mqOffGfF8wxi6yMS/sWu8nzGmPqPUfXCXqWlrCHt9YOAJiU2Yh8WkiG9WTJ6vk0Ndho3gsHzIdnqW1VjrPHECcHoklvtF5mZim9n2Hp74XTl5HUm0u/3cNH5+QMZOIyCTePOM/YniB+uNpuLhURp8rMTI+954V0WFHqs6w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710190698; c=relaxed/simple; bh=B02aWzY2dseFQDiaTIYUeOJaOZnrmX6X2PhRSaKB7Og=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=L88Avj5+7BfcZln0SMIolLZdfCX84UztjpmGvnQ3ccxWpdLJSfhxNZ0sa/5/jh0KaAPWAsQTEpmSCB013xbROErNHNLcG+W+czFWVD7GJvrzlL1J/ap7+568dIBe+nB9+QjWWph5YKYs0IaXdSWyxliXTN+oYAdEkJ+GhaHa/S4= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: gdb-patches@sourceware.org Cc: binutils@sourceware.org, Sam James Subject: [PATCH 2/2] contrib: sync dg-extract-results.sh with GCC Date: Mon, 11 Mar 2024 20:57:46 +0000 Message-ID: <20240311205757.1471015-2-sam@gentoo.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311205757.1471015-1-sam@gentoo.org> References: <20240311205757.1471015-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This syncs dg-extract-results.sh with GCC. It contains two commits: r14-4333-g346f5991569fae and r14-9393-g64273a7e6bd8ba. contrib/ChangeLog: * dg-extract-results.sh: Sync with GCC. --- contrib/ChangeLog | 1 + contrib/dg-extract-results.sh | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 369bcc5bee2..e5c54c330f4 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,6 +1,7 @@ 2024-03-11 Sam James * dg-extract-results.py: Sync with GCC. + * dg-extract-results.sh: Sync with GCC. 2020-09-25 Simon Marchi diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index ff6c50d029c..539d596a89d 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -6,7 +6,7 @@ # The resulting file can be used with test result comparison scripts for # results from tests that were run in parallel. See usage() below. -# Copyright (C) 2008, 2009, 2010, 2012 Free Software Foundation +# Copyright (C) 2008-2024 Free Software Foundation, Inc. # Contributed by Janis Johnson # # This file is part of GCC. @@ -28,14 +28,17 @@ PROGNAME=dg-extract-results.sh -# Try to use the python version if possible, since it tends to be faster. +# Try to use the python version if possible, since it tends to be faster and +# produces more stable results. PYTHON_VER=`echo "$0" | sed 's/sh$/py/'` -if test "$PYTHON_VER" != "$0" && - test -f "$PYTHON_VER" && - python -c 'import sys, getopt, re, io, datetime, operator; sys.exit (0 if sys.version_info >= (2, 6) else 1)' \ - > /dev/null 2> /dev/null; then - exec python $PYTHON_VER "$@" -fi +for python in python3 python python2 ; do + if test "$PYTHON_VER" != "$0" && + test -f "$PYTHON_VER" && + ${python} -c 'import sys, getopt, re, io, datetime, operator; sys.exit (0 if sys.version_info >= (2, 6) else 1)' \ + > /dev/null 2> /dev/null; then + exec ${python} $PYTHON_VER "$@" + fi +done usage() { cat <&2 @@ -271,7 +274,7 @@ cat $SUM_FILES \ # Write the begining of the combined summary file. -head -n 2 $FIRST_SUM +head -n 3 $FIRST_SUM echo echo " === $TOOL tests ===" echo