From patchwork Wed Jan 16 22:42:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Tan X-Patchwork-Id: 10767045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62D4317FB for ; Wed, 16 Jan 2019 22:42:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 552332F00C for ; Wed, 16 Jan 2019 22:42:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4989E2F788; Wed, 16 Jan 2019 22:42:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3CF42F00C for ; Wed, 16 Jan 2019 22:42:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387496AbfAPWma (ORCPT ); Wed, 16 Jan 2019 17:42:30 -0500 Received: from mail-vs1-f74.google.com ([209.85.217.74]:46590 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733288AbfAPWma (ORCPT ); Wed, 16 Jan 2019 17:42:30 -0500 Received: by mail-vs1-f74.google.com with SMTP id n87so3392888vsi.13 for ; Wed, 16 Jan 2019 14:42:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=v5ncvF0/tMxmsjbrRb4qeq3WPVkNRAUgsE/fIVkGHIM=; b=Zanj5d2a1GNGCX4UhFZ8xtMrnCTKy2L6l+WqG0YTi00TkSy+OQ+vFMFnHxCCiZPgZu SVTiBoUSJy/g2SAnz/Z8kfw+0E23LJer66mUUUxlOH2f+ze8wVX2GETV30HCpzG7N2cj XEMu+WtCoEByKhNKOpJBVXh3iK7f+nvGnKEizkpSIMprKzYYUh6SoeGiuAfwB/SOzXkP uofup7ts+d7p9Miak1SDh2NooZGREvbdHD+EmXjxhsghRnFHbPFvPX7HsAN3JPenZQl/ tLhu+Sz3Y/uR7+Jk4U6D9a64atKCvsroVfds2t0ZEQ5lK8gchLyHA3LYkTlhTgXFBzyN 61VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=v5ncvF0/tMxmsjbrRb4qeq3WPVkNRAUgsE/fIVkGHIM=; b=LY96ZURh7od7xeKzb5IZDZkLkyXry6oURFptC49iQlYdDSBeG7s8j/zUmjmgQ5fI0o +PEYp3fVjAioOg5idmbD52JMv56Ir6aq4O2j6kp0HpSA0J+m3hyHgNrgzjba+KSjhnwO R2e+0pgEX6xUJD5jeloQtao4uMz03FnUmyiK3mxNIm493srZZE+sisLFPGgy3GszCP09 krKTKmSj6suqZbVhD4MCCsR85yotAMc27l0HM4kQWIgmOToe9fv6K+gDwGmYfXyowHNW guyC95NcD/1rcFZOBYV1nOUMjma8HQFq3UvWHK/SUHDZY7kLLM6TN1OYksJZjKUCpnQD GH+Q== X-Gm-Message-State: AJcUukcn0xCTHMxjyLDa53Fz57HRw5flF3i3BSxYOqiSF76P05vq7mbW PyvddQqhshN5unVL6qMd24IDuWkLk8GBkc+RVaUp1s/AEa1Sx8TP4ysoW7kH184nSwIp0afDFIe BNLkHeISr/bo9oYQwIC33H8Fji3DbLPTIz5mYIDIwtbm3hQD9Bg4xHfM5G5oc5nRMtiuIAaIn46 0g X-Google-Smtp-Source: ALg8bN6Kc0cCAg+d1LYWli/sTAJwixJ8h/O4I5kCgSEICGNkqAGxy/IY59jMVSFRDJk9IVBpzvNU2wMOc8llT3Vg1ICE X-Received: by 2002:a1f:f8e:: with SMTP id 136mr6935787vkp.4.1547678549619; Wed, 16 Jan 2019 14:42:29 -0800 (PST) Date: Wed, 16 Jan 2019 14:42:11 -0800 In-Reply-To: Message-Id: <0820b3411cf217fd3fe0ecf40edafd7adec4851e.1547677183.git.jonathantanmy@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.19.0.271.gfe8321ec05.dirty Subject: [WIP 3/8] t5503: fix overspecification of trace expectation From: Jonathan Tan To: git@vger.kernel.org Cc: Jonathan Tan , avarab@gmail.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In order to extract the wants from a trace, a loop in t5503 currently breaks if "0000" is found. This works for protocol v0 and v1, but not v2. Instead, teach t5503 to look specifically for the "want" string, which is compatible with all protocols. Signed-off-by: Jonathan Tan --- t/t5503-tagfollow.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh index 4ca48f0276..6041a4dd32 100755 --- a/t/t5503-tagfollow.sh +++ b/t/t5503-tagfollow.sh @@ -47,7 +47,7 @@ get_needs () { test -s "$1" && perl -alne ' next unless $F[1] eq "upload-pack<"; - last if $F[2] eq "0000"; + next unless $F[2] eq "want"; print $F[2], " ", $F[3]; ' "$1" }