From 337377ab572e2eabf2e5ae9ed8b15b6e83e5b8b6 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 13 Apr 2022 03:45:59 -0400
Subject: [PATCH] savecheck only needs to be run for makiung coverage reports.

---
 tests/Makefile | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index b3cc2c3..aa7834f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -19,14 +19,15 @@ TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 .PHONY: check coverage clean testlist listcheck savegames buildregress
 .PHONY: savecheck regress
 
-check: savecheck tapcheck
+check: tapcheck
 	@echo "=== No diff output is good news."
-	@-advent -x 2>/dev/null	# Get usage message into coverage tests
-	@-advent -l /dev/null <pitfall.log >/dev/null
 
 coverage: check
 	lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
 	genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
+	@-advent -x 2>/dev/null	# Get usage message into coverage tests
+	@-advent -l /dev/null <pitfall.log >/dev/null
+	make savecheck
 	./coverage_dungeon.py
 
 .SUFFIXES: .chk
@@ -42,7 +43,18 @@ listcheck:
 	    if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
 	done
 
-# Generate bogus savegames.
+# Rebuild characterizing tests
+buildregress: savegames
+	$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
+	@for file in $(TESTLOADS); do \
+	    echo "Remaking $${file}.chk"; \
+	    OPTS=`sed -n /#options:/s///p <$${file}.log`; \
+	    advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
+	done; \
+	echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
+	rm -f scratch.tmp
+
+# Generate bogus savegames for coverage testing.
 savegames:
 	@$(ECHO) "cheat: Generate save file with -900 deaths"
 	@$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
@@ -58,18 +70,7 @@ savegames:
 	@$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
 	@rm -f /tmp/cheat*
 
-
-# Rebuild characterizing tests
-buildregress: savegames
-	$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
-	@for file in $(TESTLOADS); do \
-	    echo "Remaking $${file}.chk"; \
-	    OPTS=`sed -n /#options:/s///p <$${file}.log`; \
-	    advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
-	done; \
-	echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
-	rm -f scratch.tmp
-
+# Force coverage of various edge cases
 savecheck: savegames
 	@$(ECHO) "TEST cheat: Bogus option for save file generation"
 	@$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
-- 
2.31.1