Merge branch 'nk/perf-fsmonitor-cleanup'

gitster · gitster · commit 8e2def76f76c · 2020-12-08T15:11:20.000-08:00
Test clean-up.

* nk/perf-fsmonitor-cleanup:
  perf/fsmonitor: use test_must_be_empty helper
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
@@ -129,8 +129,7 @@ setup_for_fsmonitor() {
 
 	git config core.fsmonitor "$INTEGRATION_SCRIPT" &&
 	git update-index --fsmonitor 2>error &&
-	cat error &&
-	[ ! -s error ] # ensure no silent error
+	test_must_be_empty error  # ensure no silent error
 }
 
 test_perf_w_drop_caches () {

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,7 @@ setup_for_fsmonitor() {`
`129`	`129`
`130`	`130`	`git config core.fsmonitor "$INTEGRATION_SCRIPT" &&`
`131`	`131`	`git update-index --fsmonitor 2>error &&`
`132`		`- cat error &&`
`133`		`- [ ! -s error ] # ensure no silent error`
	`132`	`+ test_must_be_empty error # ensure no silent error`
`134`	`133`	`}`
`135`	`134`
`136`	`135`	`test_perf_w_drop_caches () {`