From 850d16fa02aac3693bd0b89a5eaac2b2e5fd3183 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:53:01 -0800
Subject: [PATCH] Don't clobber other parts build directories on run target.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 fuzzers/000-init-db/Makefile            | 2 +-
 fuzzers/001-part-yaml/Makefile          | 5 ++---
 fuzzers/005-tilegrid/Makefile           | 3 ++-
 fuzzers/005-tilegrid/fuzzaddr/common.mk | 2 +-
 fuzzers/072-ordered_wires/Makefile      | 5 +++--
 fuzzers/073-get_counts/Makefile         | 2 +-
 fuzzers/074-dump_all/Makefile           | 2 +-
 fuzzers/075-pins/Makefile               | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/fuzzers/000-init-db/Makefile b/fuzzers/000-init-db/Makefile
index f4ef08d3..64f6a51f 100644
--- a/fuzzers/000-init-db/Makefile
+++ b/fuzzers/000-init-db/Makefile
@@ -91,7 +91,7 @@ pushdb: $(DB_FILES_PATH) ${XRAY_FAMILY_DIR}/${XRAY_PART}
 	@true
 
 run:
-	$(MAKE) clean
+	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
 	$(MAKE) pushdb
 	touch run.${XRAY_PART}.ok
 
diff --git a/fuzzers/001-part-yaml/Makefile b/fuzzers/001-part-yaml/Makefile
index 2cd79e3c..bf90aa97 100644
--- a/fuzzers/001-part-yaml/Makefile
+++ b/fuzzers/001-part-yaml/Makefile
@@ -1,7 +1,6 @@
 N := 1
-SPECIMENS := $(addprefix build_${XRAY_PART}/specimen_,$(shell seq -f '%03.0f' $(N)))
-
 BUILD_DIR = build_${XRAY_PART}
+SPECIMENS := $(addprefix $(BUILD_DIR)/specimen_,$(shell seq -f '%03.0f' $(N)))
 
 database: $(SPECIMENS)
 	mkdir -p $(BUILD_DIR)
@@ -21,7 +20,7 @@ pushdb:
 	cp $(BUILD_DIR)/${XRAY_PART}_required_features.fasm ${XRAY_FAMILY_DIR}/${XRAY_PART}/required_features.fasm 2>/dev/null || true
 
 run:
-	$(MAKE) clean
+	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
 	$(MAKE) database
 	$(MAKE) pushdb
 	touch run.${XRAY_PART}.ok
diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile
index 81959b4c..a02bba5c 100644
--- a/fuzzers/005-tilegrid/Makefile
+++ b/fuzzers/005-tilegrid/Makefile
@@ -133,7 +133,8 @@ $(BUILD_FOLDER)/tilegrid.json: generate_full.py $(BUILD_FOLDER)/tilegrid_tdb.jso
 	cd $(BUILD_FOLDER) && python3 ${FUZDIR}/generate_full.py \
         --json-in tilegrid_tdb.json --json-out ${BUILD_DIR}/tilegrid.json
 run:
-	$(MAKE) clean
+	find -name $(BUILD_FOLDER) -exec rm -rf {} \;
+	find -name run.${XRAY_PART}.ok -delete
 	$(MAKE) database
 	$(MAKE) pushdb
 	touch run.${XRAY_PART}.ok
diff --git a/fuzzers/005-tilegrid/fuzzaddr/common.mk b/fuzzers/005-tilegrid/fuzzaddr/common.mk
index f54efa78..016191d9 100644
--- a/fuzzers/005-tilegrid/fuzzaddr/common.mk
+++ b/fuzzers/005-tilegrid/fuzzaddr/common.mk
@@ -14,7 +14,7 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	$(MAKE) clean
+	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
 	$(MAKE) database
 	$(MAKE) pushdb
 	touch run.${XRAY_PART}.ok
diff --git a/fuzzers/072-ordered_wires/Makefile b/fuzzers/072-ordered_wires/Makefile
index 49682145..bbdc30b9 100644
--- a/fuzzers/072-ordered_wires/Makefile
+++ b/fuzzers/072-ordered_wires/Makefile
@@ -1,6 +1,7 @@
 
 N := 1
-SPECIMENS := $(addprefix build_${XRAY_PART}/specimen_,$(shell seq -f '%03.0f' $(N)))
+BUILD_DIR = build_${XRAY_PART}
+SPECIMENS := $(addprefix $(BUILD_DIR)/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 MAX_VIVADO_PROCESS ?= 4
 MAX_PIPS_INSTANCE ?= 340000
@@ -16,7 +17,7 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	$(MAKE) clean
+	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
 	$(MAKE) database
 	$(MAKE) pushdb
 	touch run.${XRAY_PART}.ok
diff --git a/fuzzers/073-get_counts/Makefile b/fuzzers/073-get_counts/Makefile
index 73795866..37b8cdb6 100644
--- a/fuzzers/073-get_counts/Makefile
+++ b/fuzzers/073-get_counts/Makefile
@@ -15,7 +15,7 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	$(MAKE) clean
+	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
 	$(MAKE) database
 	$(MAKE) pushdb
 	touch run.${XRAY_PART}.ok
diff --git a/fuzzers/074-dump_all/Makefile b/fuzzers/074-dump_all/Makefile
index 9d3850c5..01c07b9e 100644
--- a/fuzzers/074-dump_all/Makefile
+++ b/fuzzers/074-dump_all/Makefile
@@ -21,7 +21,7 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	$(MAKE) clean
+	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
 	$(MAKE) database
 	$(MAKE) pushdb
 	# Clean up intermediate files after successful pushdb.
diff --git a/fuzzers/075-pins/Makefile b/fuzzers/075-pins/Makefile
index 299e73c5..6471fc6d 100644
--- a/fuzzers/075-pins/Makefile
+++ b/fuzzers/075-pins/Makefile
@@ -14,7 +14,7 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	$(MAKE) clean
+	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
 	$(MAKE) database
 	$(MAKE) pushdb
 	touch run.$(XRAY_PART).ok