From patchwork Mon Dec 18 20:14:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Kitt X-Patchwork-Id: 180642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1505766dyi; Mon, 18 Dec 2023 12:14:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IFajfljfOMg+kqGTwix3C9BFI5sVIMtnU5Ft+HPJbufbaYOR0NJEC/YVGAPXW4JSVXZtTrE X-Received: by 2002:a05:6122:920:b0:4b2:c555:12fc with SMTP id j32-20020a056122092000b004b2c55512fcmr6876971vka.27.1702930479664; Mon, 18 Dec 2023 12:14:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702930479; cv=pass; d=google.com; s=arc-20160816; b=tUNQoXo8MhA1QDFEjbYX2GLpIua/JKyAJQNobPiZgyWXOOmCvvz9FJVdIukDHpyWbP /Z8RvTijkDPtfTA115g2egethWcN5NgH2kQlC1pGfIFlt4uwtLDTgTgh2Xvc+fVJexeM MUwM+4llpSpkfCd1nKvtrx4v4DFsNB2FTmk532WSrWxv4QsEx8NHaQaP5tIydX7yDdX1 FO2yRctYnipxUGQF+rWtnKb3bHjL8/ZfwtqJT4L89q2blTLg/BQ1e2/KeJOPhdaEJUox YUA+eXjcI5DXV4IqJcJdqPiV0sfNYgeEw0W2zGYpy+Q4seKfxTMRmcB6kNUrKujYH/qh 1inQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:arc-filter :dmarc-filter:delivered-to; bh=BIf9nCBAfnWGm168DJOZrONQ3/raAsLPhU44tea1nK0=; fh=zZO4qmiHk93Pmi4u9DfquuNTtpmlNezw3XOhFWRg6ZE=; b=J6GDvksF02NYoBnNxIZ+sGxGXXELlU+kWYuLxJYdMRDDCOwTN0Y6PQYmf0I6mT2S9t Q3z29WsilfT6jb4kBNBDNAqZZ6XlQ+T/kiLS5kaJZLy5AIiYXPqPwVKmhKBLvc8kj9LR aqXslbHjmjx/rqBAmKmPKv/j7NTId3dGkV+Z3WTnuQeTSgp6WZpLC5oCX0VDaE6robq0 WxawTa+D8gH8Gqz9SPbjim/4cwJqCTu2cRZx1T837GiS6KF+RVBpWOAKvzUD9yxTgSXm MIoDlN2+dIkXAqlHLoR4mC6lWoEy4+6znbSp9qVtrHzz/Is/IP2liHV9uOLv+Qhnc5rc 4Nng== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id bs5-20020a056122240500b004b2e3ddf471si4466911vkb.153.2023.12.18.12.14.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 12:14:39 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 595A33857C47 for ; Mon, 18 Dec 2023 20:14:39 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from 9.mo561.mail-out.ovh.net (9.mo561.mail-out.ovh.net [87.98.184.141]) by sourceware.org (Postfix) with ESMTPS id 1959338582B6 for ; Mon, 18 Dec 2023 20:14:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1959338582B6 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sk2.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sk2.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1959338582B6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=87.98.184.141 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702930473; cv=none; b=Ga7a7RxLG4kPXdGI4Cj47Otn2drnTRBL8A0RQhc0uB/33etnJBatxGHvzva+gi7S14JYv6eoPIHzI6tN/lu3JWkAlLGsuSFszBS45DZSICKlxELTkCow4pooPGNF0zjW+sYS6WZQ28wBeloJoLzgGLB6EoY9Uzi/o/xYzHG1FV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702930473; c=relaxed/simple; bh=3H0/SpXSDt5gMZqYK/D7h6IjTH2UIwUAXlbrya11Aug=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=itC2LNHgW3Dt3G/+c/2aqgro5lmEORbERO8tvmJRx9xu3QFLCkDRwyLQr+lLxflwybQ0IjsHO2ihR5Bb9qpPDC6y+s8h7cd+v/xwU1HwOkSkbmKG8uEyHLe8z83MOAN5iLZ1qIvr+HLU/+brXUdRXt0X6E1zE+Wt0E11nEEVBXY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.9.150]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 9CED5285CE for ; Mon, 18 Dec 2023 20:14:30 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-5gq4p (unknown [10.110.96.84]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 091B41FD2F; Mon, 18 Dec 2023 20:14:29 +0000 (UTC) Received: from sk2.org ([37.59.142.101]) by ghost-submission-6684bf9d7b-5gq4p with ESMTPSA id 5wfPKCWogGXOtAQAO/1BYw (envelope-from ); Mon, 18 Dec 2023 20:14:29 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004e274848d-4ce6-4477-aaff-ae24f8ab66d2, A0BB5B53FDF934EB2242E8667A8482E2760569A0) smtp.auth=steve@sk2.org X-OVh-ClientIp: 82.65.25.201 From: Stephen Kitt To: binutils@sourceware.org Cc: Stephen Kitt Subject: [PATCH] tests: force non-deterministic mode in non-deterministic tests Date: Mon, 18 Dec 2023 21:14:01 +0100 Message-Id: <20231218201401.966374-1-steve@sk2.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Ovh-Tracer-Id: 12116371847716308614 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvddtkedgudefvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomhepufhtvghphhgvnhcumfhithhtuceoshhtvghvvgesshhkvddrohhrgheqnecuggftrfgrthhtvghrnhepleegteeujeffjeefjeevhfdtudefjefgteelgedtudekleeiledvvdetudevjedtnecukfhppeduvdejrddtrddtrddupdekvddrieehrddvhedrvddtuddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehsthgvvhgvsehskhdvrdhorhhgqedpnhgspghrtghpthhtohepuddprhgtphhtthhopegsihhnuhhtihhlshesshhouhhrtggvfigrrhgvrdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785652031037913432 X-GMAIL-MSGID: 1785652031037913432 Since ar can be built defaulting to deterministic mode, tests which expect non-deterministic behaviour need to explicitly set the U flag. Signed-off-by: Stephen Kitt --- binutils/testsuite/binutils-all/ar.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: c4fb39bb31a53bbb2df3be3200d694f025c5b892 diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp index aade419344e..e65cad8e695 100644 --- a/binutils/testsuite/binutils-all/ar.exp +++ b/binutils/testsuite/binutils-all/ar.exp @@ -581,7 +581,7 @@ proc replacing_non_deterministic_member { } { # Build the archive with the *newer* object file. - set got [binutils_run $AR "rc $archive ${newer_objfile}"] + set got [binutils_run $AR "rcU $archive ${newer_objfile}"] if ![string match "" $got] { fail "$testname: (could not build archive)" return @@ -589,7 +589,7 @@ proc replacing_non_deterministic_member { } { # Now try to replace the newer file with the older one. This should not work. - set got [binutils_run $AR "ru $archive $older_objfile"] + set got [binutils_run $AR "ruU $archive $older_objfile"] if ![string match "" $got] { fail "$testname: (failed to replace file)" return @@ -651,7 +651,7 @@ proc replacing_sde_deterministic_member { } { # Build the archive with the *newer* object file. setenv SOURCE_DATE_EPOCH "1000" - set got [binutils_run $AR "rc $archive ${newer_objfile}"] + set got [binutils_run $AR "rcU $archive ${newer_objfile}"] if ![string match "" $got] { fail "$testname: (could not build archive)" unsetenv SOURCE_DATE_EPOCH @@ -662,7 +662,7 @@ proc replacing_sde_deterministic_member { } { # archive this will not work, but one created to be deterministic # should always replace its members. - set got [binutils_run $AR "ru $archive $older_objfile"] + set got [binutils_run $AR "ruU $archive $older_objfile"] if ![string match "" $got] { fail "$testname: (failed to replace file)" unsetenv SOURCE_DATE_EPOCH