From patchwork Mon Jul 13 15:07:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1328107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=sUeS0a4j; dkim-atps=neutral Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B56TW64vtz9sRW for ; Tue, 14 Jul 2020 01:07:58 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D98B8385EC56; Mon, 13 Jul 2020 15:07:55 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by sourceware.org (Postfix) with ESMTPS id 0E5CB385EC56 for ; Mon, 13 Jul 2020 15:07:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0E5CB385EC56 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qt1-x836.google.com with SMTP id b25so10188106qto.2 for ; Mon, 13 Jul 2020 08:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=azM2XRy7IzJFwEJyY+liMQwcbL8oJayWJtPHvWzchJk=; b=sUeS0a4jB24fI3rBx+r0xx5sG6crW3EBD1MEPZWcDrVWJKfxM1adxluYsrmojLfvPz bBpl2QV4CJNL0dDWhL8tPuFYZehweeqQzi7yAo34u+BmmKvFVf+OnRKhIU1tOOrbpbvI Rvk1tzCKCwd+pS98y8G545sLVT+wy8FUb3+3/yiz/SWkEyhNXz2y6cOQE4x/sRB8ofvT awrybBF1Q6N8lw2CqeF4MGQs4mPn9quq6RUdKVQz/eTE+OcidcaxSPy6jnw6i3Y5ovS5 /hbekJcYMFjxgqz9jcpgGm8rial4iPKSvru7uTn+N6zIE3QqtdBAaIuOWbQhWO7+SGxP sBDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=azM2XRy7IzJFwEJyY+liMQwcbL8oJayWJtPHvWzchJk=; b=IF6OZA3gZllqAbS8yIGv9qRW9JeMk2oeAe6iS/p2lviqzDIVkzVut7WI0WleIjv3kS tkDXtxaZRB9+k4zpLkoHalWM4OC1k9AzGL9y0rkIbJp0OqJKUzYu6cINYeDCLnjRPypD vlpHbBlnzI675E05ppSrRMvYCOvR877lsH3CJjngEjwis+4XZ7U1N+2D0vb8RGJ3+2ky WY7CTmn9LMEDq9SOp4VpYpTlEBjjzjKD2wA2bJYXQkITvuyRiLGRdZX1wWt/VLIj0tMp wVuSU04/DCF398wW4+yHL5Siy4kWO4gHrXFdF6xs6pDlp/KDx1PE8ChUInFmzKEZdKC+ N5Gw== X-Gm-Message-State: AOAM5328/oFv3T+SuzxDYDtF1Q54RTg/C51WK+7nd3UaTH7ofWaQptCq x5rHL5wrGtf2Z2gft09kQlc= X-Google-Smtp-Source: ABdhPJypGQnpohGJ2LeA1RBLsYmS9a0iuYrzvc4BK6A0Husj6DH3doEuWxgKkaIxyLk61lTyQxgC/A== X-Received: by 2002:ac8:6bc8:: with SMTP id b8mr82369400qtt.198.1594652872277; Mon, 13 Jul 2020 08:07:52 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a8:1102:453d:a0e4:451d:56b3? ([2620:10d:c091:480::1:3fa6]) by smtp.googlemail.com with ESMTPSA id c9sm18050827qko.24.2020.07.13.08.07.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Jul 2020 08:07:51 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: testsuite: Fix scan-lang-dump-not Message-ID: Date: Mon, 13 Jul 2020 11:07:50 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" pushed as obvious turned out scan-lang-dump-not was broken in the 3 argument case -- I'd missed a necessary empty arg. Fixed thusly. gcc/testsuite/ * lib/scanlang.exp (scan-lang-dump-not): Fix 3-arg case. diff --git c/gcc/testsuite/lib/scanlang.exp w/gcc/testsuite/lib/scanlang.exp index 2f80f65f569..d9f8c1e6e83 100644 --- c/gcc/testsuite/lib/scanlang.exp +++ w/gcc/testsuite/lib/scanlang.exp @@ -36,10 +36,11 @@ proc scan-lang-dump { args } { return } if { [llength $args] >= 3 } { - scan-dump "lang" [lindex $args 0] \ - "\[0-9\]\[0-9\]\[0-9\]l.[lindex $args 1]" "" [lindex $args 2] + scan-dump-not "lang" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]l.[lindex $args 1]" "" \ + [lindex $args 2] } else { - scan-dump "lang" [lindex $args 0] \ - "\[0-9\]\[0-9\]\[0-9\]l.[lindex $args 1]" "" + scan-dump-not "lang" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]l.[lindex $args 1]" } }