From patchwork Fri Mar 18 15:38:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 52101 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 285BD3888C57 for ; Fri, 18 Mar 2022 15:39:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 285BD3888C57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1647617967; bh=hnJcuUIYDJNZEgLltouBW3Eax9OPrt5V1iUI7zokj/A=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=G6gb9uMgBvChToAwddkm7Y28h/qV+EVUmk1MMAa74oAalgD6qCclRBl711YXQXYtv rvr6xGUglEmtrU64cGKs+Oey0/rO21UQo49EXEsO0mKqnWpQy3delE88e831vOu3cc oGP4fwpB/g37DltbS/jVjM98lRu0ICtNbuXk/sCk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id 32FD73858D3C for ; Fri, 18 Mar 2022 15:38:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 32FD73858D3C Received: by mail-wm1-x334.google.com with SMTP id l1-20020a05600c4f0100b00389645443d2so4991582wmq.2 for ; Fri, 18 Mar 2022 08:38:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=hnJcuUIYDJNZEgLltouBW3Eax9OPrt5V1iUI7zokj/A=; b=1ZUE2QWdUBURASADV8jzC2DrPJ5HYEte+rpYZ7o1S7W1zgOWBNikd1JBAUkJOqyfkU J0yR1BocnhMeOWy9mpcN6O9WvryS8eko9jpJMVuN/X93I4JELJ9q/mkr0bUNLcxvehjg 3ci7SOS+LxIPNxI9YS+JujSMonMarXdcsexfHOmow82LQb12WIK7rebghyAmVJyIEzNB eoyfxOo+QIE71hWt7MQy+wgUx8IXeRSMNYllfr6IJdIZKKGyfe/HyZWIoV4m42+epdNh BwnCKHEGMPIKSQIe/ob05Aujg8j5LENOWn0IRAPfguuaMM4CkoYbGja0dSD6QrErkuNz 0T+g== X-Gm-Message-State: AOAM533UX4W894wyUmOuToZMLpIC2k4BlUq1a1wz/xV+VwvKXq2888ft tS9WQfx5HpQEFgFG7jfrA2Z9TR9GTzc= X-Google-Smtp-Source: ABdhPJzBL/1kAKsQaEeNHYW3+lBCYKD7WN2cAulhUAUr+9cFMNSMyS6r90/nF1LHfQkGHOT87zJndw== X-Received: by 2002:a1c:2c2:0:b0:38c:835a:10fd with SMTP id 185-20020a1c02c2000000b0038c835a10fdmr5348143wmc.73.1647617934668; Fri, 18 Mar 2022 08:38:54 -0700 (PDT) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id p2-20020a5d4582000000b00203f51aa12asm2085053wrq.55.2022.03.18.08.38.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Mar 2022 08:38:54 -0700 (PDT) X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [pushed] testsuite, modules, Darwin: Adjust expected output for older OS versions. Date: Fri, 18 Mar 2022 15:38:46 +0000 Message-Id: <20220318153846.78531-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Spam-Status: No, score=-8.4 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Sandoe via Gcc-patches From: Iain Sandoe Reply-To: iain@sandoe.co.uk Cc: Iain Sandoe Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Darwin versions <= 10 (macOS 10.6) emit different diagnostics for the failure case being tested by bad-mapper-1.C. Adjust the dg- expressions to reflect this. tested on powerpc,i686-darwin9, x86-64-darwin10,17,20 powerpc64le,powerpc64,x86_64-linux-gnu, pushed to master, thanks Iain Signed-off-by: Iain Sandoe gcc/testsuite/ChangeLog: * g++.dg/modules/bad-mapper-1.C: Make dg- expressions that match the diagnostics output by earlier Darwin too. --- gcc/testsuite/g++.dg/modules/bad-mapper-1.C | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/g++.dg/modules/bad-mapper-1.C b/gcc/testsuite/g++.dg/modules/bad-mapper-1.C index 7ed75b824b4..6d0ed4b5895 100644 --- a/gcc/testsuite/g++.dg/modules/bad-mapper-1.C +++ b/gcc/testsuite/g++.dg/modules/bad-mapper-1.C @@ -1,6 +1,9 @@ // { dg-additional-options "-fmodules-ts -fmodule-mapper=|this-will-not-work" } import unique1.bob; -// { dg-error "-:failed exec.*mapper.* .*this-will-not-work" "" { target *-*-* } 0 } +// { dg-error "-:failed exec.*mapper.* .*this-will-not-work" "" { target { ! { *-*-darwin[89]* *-*-darwin10* } } } 0 } // { dg-prune-output "fatal error:" } // { dg-prune-output "failed to read" } // { dg-prune-output "compilation terminated" } +// { dg-error "-:failed mapper handshake communication" "" { target { *-*-darwin[89]* *-*-darwin10* } } 0 } +// { dg-prune-output "trying to exec .this-will-not-work." } +// { dg-prune-output "unknown Compiled Module Interface" }