Merge PR coq#19020: Compatibility of new fast "make report" with MacOS X

Reviewed-by: SkySkimmer Co-authored-by: SkySkimmer <[email protected]>
SkySkimmer · May 15, 2024 · cf2842d · cf2842d
2 parents e4df362 + 7f6b1b6
commit cf2842d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test-suite/Makefile b/test-suite/Makefile
@@ -241,7 +241,8 @@ $(foreach S,$(VSUBSYSTEMS),$(eval $(call vdeps,$(S))))
 # Summary
 #######################################################################
 
-summary_dir = echo $(1); find $(2) -name '*.log' -print0 | xargs -0 tail -q -n1 | sort
+# using "-L 999" because some versions of tail do not accept more than ~1k arguments
+summary_dir = echo $(1); find $(2) -name '*.log' -print0 | xargs -0 -L 999  tail -q -n1 | sort
 
 .PHONY: summary summary.log
 

diff --git a/test-suite/report.sh b/test-suite/report.sh
@@ -12,7 +12,7 @@ rm -rf "$SAVEDIR"
 mkdir "$SAVEDIR"
 
 FAILED=$(mktemp)
-grep -F 'Error!' -r . -lZ --include="*.log" > "$FAILED"
+grep -F 'Error!' -r . -l --null --include="*.log" > "$FAILED"
 
 rsync -a --from0 --files-from="$FAILED" . "$SAVEDIR"
 cp summary.log "$SAVEDIR"/