[PATCH 4/6] fsmonitor: Make output of test-dump-fsmonitor more concise
From: Alex Vandiver <hidden>
Date: 2018-01-03 03:05:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
Rather than display 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 <redacted>
---
t/helper/test-dump-fsmonitor.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c
index 48c4bab0b..5d61b0d62 100644
--- a/t/helper/test-dump-fsmonitor.c
+++ b/t/helper/test-dump-fsmonitor.c@@ -4,7 +4,8 @@ int cmd_main(int ac, const char **av) { struct index_state *istate = &the_index; - int i; + uint64_t now = getnanotime(); + int i, valid = 0; git_config_push_parameter("core.fsmonitor=keep"); setup_git_directory();
@@ -14,10 +15,17 @@ int cmd_main(int ac, const char **av) printf("no fsmonitor\n"); return 0; } - printf("fsmonitor last update %"PRIuMAX"\n", (uintmax_t)istate->fsmonitor_last_update); + + printf("fsmonitor last update %"PRIuMAX", (%.2f seconds ago)\n", + (uintmax_t)istate->fsmonitor_last_update, + (now - istate->fsmonitor_last_update)/1.0e9); 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(" valid: %d\n", valid); + printf(" invalid: %d\n", istate->cache_nr - valid); return 0; }
--
2.15.1.31.gddce0adfe