From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id DB3F61F934 for ; Wed, 21 Oct 2020 18:04:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503605AbgJUSEk (ORCPT ); Wed, 21 Oct 2020 14:04:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405153AbgJUSEj (ORCPT ); Wed, 21 Oct 2020 14:04:39 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72AA3C0613CF for ; Wed, 21 Oct 2020 11:04:39 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id 13so3065581wmf.0 for ; Wed, 21 Oct 2020 11:04:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Ai9JYqlJh47JBTVfqyQu0+EgkRZlNcwR2sfJrzvRFSQ=; b=XoMtlAz6ZSALkvIAw+r6lMP9FdX56gwb1pumwedjLv7IwlFwhz5Yx/JqcIQ31zUFFJ NibtU8Y6d4G7MlaHRjkLxppzRguMkMiGhZVgu+uGV5bGRRjDbPqIB3KWKIqdV2FJWeKO WkDaLzX1wnIcRAKIa8hoIR86jRgzyGDxMB4q/cMV7BI1ksGynMkT77uxp7x0KRiPTLUt PB3nsJifUgF2S58kIouul6k7IagsApxVDacEnSZvNdnYYAARR0ViC47CHp67ADtVFmIL 1XI1/BX7QD7ZDyGrKYrCqPaGHYrabF/2svmlxJPd1M0iXLLqd7NBCkRabvFUvJ6yKVpD SRAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Ai9JYqlJh47JBTVfqyQu0+EgkRZlNcwR2sfJrzvRFSQ=; b=Tx9+NWMwZHMSXzPJ8iILOIvjriaAqx7g+ZNKMnydW6ibKoJGiCP/wwCVctNDpMS3Hg YQC9l7MdpsdWoTvr4CeYpIGWwxX6WSoaexpEpsBaIQEPTm5MB+EQ4GitjLJfVdvJmT+j dA99PwIgSUKSKnuMOV+ZmnZaONeu4zneiIU3f0CQLC8aZ7e3pfGHdvDzitLKvazgxcDv IUVXjNDfUUrqtek00ByuZK/7uRY2gGzTemM8cSjxwEBE8yIFxz/CoK1ZMkmZh/nuDEaH bZFIbFxcuIhUJrr7rL9gU9qvaofo6Q1g6Oxc2Rlfd42ZUX/jjhnub3MDYOPGNRff1Lc6 RcZQ== X-Gm-Message-State: AOAM532oV7vZUFj1OXUPkfzqGE7SoW6zzcDPIpzDJNwF9iWIJ1h6gihe aDW+97EcobXeoRVd779pxhspo8ML/xQ= X-Google-Smtp-Source: ABdhPJw6MlY4AmYXEZm/UT06Ng3lkPEIGk8PmL9ZlMWj+jQWZslez7nyrXEe6OvRvFt+sHN7QYLZfw== X-Received: by 2002:a1c:2cc2:: with SMTP id s185mr4926421wms.77.1603303478061; Wed, 21 Oct 2020 11:04:38 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a15sm5221104wro.3.2020.10.21.11.04.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 11:04:37 -0700 (PDT) Message-Id: <598521091a54caa73556b8bc9caf552d3216ba63.1603303474.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Alex Vandiver via GitGitGadget" Date: Wed, 21 Oct 2020 18:04:34 +0000 Subject: [PATCH 2/2] fsmonitor: make output of test-dump-fsmonitor more concise Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Alex Vandiver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Alex Vandiver After displaying one very long line, summarize the contents of that line. The tests do not currently rely on any content except the first line ("no fsmonitor" / "fsmonitor last update"). Signed-off-by: Alex Vandiver Signed-off-by: Nipunn Koorapati --- t/helper/test-dump-fsmonitor.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c index 975f0ac890..a42e402bf8 100644 --- a/t/helper/test-dump-fsmonitor.c +++ b/t/helper/test-dump-fsmonitor.c @@ -4,7 +4,7 @@ int cmd__dump_fsmonitor(int ac, const char **av) { struct index_state *istate = the_repository->index; - int i; + int i, valid = 0; setup_git_directory(); if (do_read_index(istate, the_repository->index_file, 0) < 0) @@ -15,8 +15,18 @@ int cmd__dump_fsmonitor(int ac, const char **av) } printf("fsmonitor last update %s\n", istate->fsmonitor_last_update); - for (i = 0; i < istate->cache_nr; i++) + for (i = 0; i < istate->cache_nr; i++) { printf((istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) ? "+" : "-"); + if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) + valid++; + } + + printf("\n valid: %d\n", valid); + printf(" invalid: %d\n", istate->cache_nr - valid); + + for (i = 0; i < istate->cache_nr; i++) + if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID)) + printf(" - %s\n", istate->cache[i]->name); return 0; } -- gitgitgadget