From a4dd142bb9cad9a0db516109b07a9b4c6056344d Mon Sep 17 00:00:00 2001
From: Mehdi Khairy <mehdi.khairy@more-magic.org>
Date: Tue, 8 Jan 2019 20:01:38 +0100
Subject: [PATCH] Bug #171: Fixing build directory for Fuzzers 071

Signed-off-by: Mehdi Khairy <mehdi.khairy@more-magic.org>
---
 fuzzers/071-ppips/Makefile     | 28 ++++++++++++++--------------
 fuzzers/071-ppips/generate.sh  |  2 +-
 fuzzers/071-ppips/generate.tcl |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/fuzzers/071-ppips/Makefile b/fuzzers/071-ppips/Makefile
index d6583293..29ae84b2 100644
--- a/fuzzers/071-ppips/Makefile
+++ b/fuzzers/071-ppips/Makefile
@@ -1,23 +1,23 @@
 
 N := 1
-SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))
+SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
 database: $(SPECIMENS_OK)
-	cp specimen_001/ppips_clblm_l.txt .
-	cp specimen_001/ppips_clblm_r.txt .
-	cp specimen_001/ppips_clbll_l.txt .
-	cp specimen_001/ppips_clbll_r.txt .
-	cp specimen_001/ppips_int_l.txt .
-	cp specimen_001/ppips_int_r.txt .
+	cp build/specimen_001/ppips_clblm_l.txt build/
+	cp build/specimen_001/ppips_clblm_r.txt build/
+	cp build/specimen_001/ppips_clbll_l.txt build/
+	cp build/specimen_001/ppips_clbll_r.txt build/
+	cp build/specimen_001/ppips_int_l.txt build/
+	cp build/specimen_001/ppips_int_r.txt build/
 
 pushdb:
-	cp ppips_clblm_l.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_clblm_l.db
-	cp ppips_clblm_r.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_clblm_r.db
-	cp ppips_clbll_l.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_clbll_l.db
-	cp ppips_clbll_r.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_clbll_r.db
-	cp ppips_int_l.txt   ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_int_l.db
-	cp ppips_int_r.txt   ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_int_r.db
+	cp build/ppips_clblm_l.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_clblm_l.db
+	cp build/ppips_clblm_r.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_clblm_r.db
+	cp build/ppips_clbll_l.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_clbll_l.db
+	cp build/ppips_clbll_r.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_clbll_r.db
+	cp build/ppips_int_l.txt   ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_int_l.db
+	cp build/ppips_int_r.txt   ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_int_r.db
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
@@ -30,7 +30,7 @@ run:
 	touch run.ok
 
 clean:
-	rm -rf specimen_[0-9][0-9][0-9]/ ppips_clbl[ml]_[lr].txt ppips_int_[lr].txt run.ok
+	rm -rf build run.ok
 
 .PHONY: database pushdb run clean
 
diff --git a/fuzzers/071-ppips/generate.sh b/fuzzers/071-ppips/generate.sh
index ccc5a065..e6b0e2c6 100644
--- a/fuzzers/071-ppips/generate.sh
+++ b/fuzzers/071-ppips/generate.sh
@@ -2,5 +2,5 @@
 
 source ${XRAY_GENHEADER}
 
-${XRAY_VIVADO} -mode batch -source ../generate.tcl
+${XRAY_VIVADO} -mode batch -source $FUZDIR/generate.tcl
 
diff --git a/fuzzers/071-ppips/generate.tcl b/fuzzers/071-ppips/generate.tcl
index 9692b4fc..354a7e4e 100644
--- a/fuzzers/071-ppips/generate.tcl
+++ b/fuzzers/071-ppips/generate.tcl
@@ -1,6 +1,6 @@
 create_project -force -part $::env(XRAY_PART) design design
 
-read_verilog ../top.v
+read_verilog $::env(FUZDIR)/top.v
 synth_design -top top
 
 set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_00) IOSTANDARD LVCMOS33" [get_ports a]