From 15a22bd1c819f6f82dca15bee379741561ba6389 Mon Sep 17 00:00:00 2001
From: Greg King <gregdk@users.sf.net>
Date: Wed, 17 Dec 2014 17:35:18 -0500
Subject: [PATCH] All regression-tests subdirectories are cleaned before the
 first test starts, so that 'make continue' won't see debris when it moves to
 the next directory.

---
 test/Makefile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index b942cbcdf..579fc8b92 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,9 @@
 
 # toplevel makefile for the regression tests
 
-MAKE := make --no-print-dir
+# You can comment this special target when you debug the regression tests.
+# Then, make will give you more progress reports.
+.SILENT:
 
 ifneq ($(shell echo),)
   CMD_EXE = 1
@@ -21,21 +23,17 @@ endif
 
 WORKDIR := ../testwrk
 
-.PHONY: dotests clean
+.PHONY: all dotests continue mostly-clean clean
 
 all: dotests
 
 $(WORKDIR):
-	@$(MKDIR) $(WORKDIR)
+	$(MKDIR) $(WORKDIR)
 
-$(WORKDIR)/bdiff$(EXE): $(WORKDIR)
-	@$(CC) -o $(WORKDIR)/bdiff$(EXE) bdiff.c
+$(WORKDIR)/bdiff$(EXE): bdiff.c | $(WORKDIR)
+	$(CC) -O2 -o $@ $<
 
-dotests: $(WORKDIR)/bdiff$(EXE)
-	@$(MAKE) -C val clean all
-	@$(MAKE) -C ref clean all
-	@$(MAKE) -C err clean all
-	@$(MAKE) -C misc clean all
+dotests: mostly-clean continue
 
 continue: $(WORKDIR)/bdiff$(EXE)
 	@$(MAKE) -C val all
@@ -43,10 +41,12 @@ continue: $(WORKDIR)/bdiff$(EXE)
 	@$(MAKE) -C err all
 	@$(MAKE) -C misc all
 
-clean:
+mostly-clean:
 	@$(MAKE) -C val clean
 	@$(MAKE) -C ref clean
 	@$(MAKE) -C err clean
 	@$(MAKE) -C misc clean
-	@$(RM) $(WORKDIR)/bdiff$(EXE)
-	@$(RMDIR) $(WORKDIR)
+
+clean: mostly-clean
+	$(RM) $(WORKDIR)/bdiff$(EXE)
+	$(RMDIR) $(WORKDIR)
-- 
2.39.5