From 32f1304e84ba691b22e47d75f4521d4da9bfa2da Mon Sep 17 00:00:00 2001
From: Rick Altherr <kc8apf@kc8apf.net>
Date: Wed, 15 Nov 2017 03:56:16 -0500
Subject: [PATCH] fuzzers/013-intpips: fix tool paths

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
---
 fuzzers/013-intpips/Makefile    | 24 ++++++++++++------------
 fuzzers/013-intpips/generate.sh |  1 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/fuzzers/013-intpips/Makefile b/fuzzers/013-intpips/Makefile
index c4c15231..bbb8f684 100644
--- a/fuzzers/013-intpips/Makefile
+++ b/fuzzers/013-intpips/Makefile
@@ -4,24 +4,24 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
 database: $(SPECIMENS_OK)
-	../../build/tools/segmatch -m 5 -M 15 -o seg_clbll_int_l.segbits $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS))
-	../../build/tools/segmatch -m 5 -M 15 -o seg_clbll_int_r.segbits $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS))
-	../../build/tools/segmatch -m 5 -M 15 -o seg_clblm_int_l.segbits $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS))
-	../../build/tools/segmatch -m 5 -M 15 -o seg_clblm_int_r.segbits $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_clbll_int_l.segbits $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_clbll_int_r.segbits $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_clblm_int_l.segbits $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_clblm_int_r.segbits $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS))
 	grep -h ^bit $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS)) | sort -u > seg_clbll_mask_l.segbits
 	grep -h ^bit $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS)) | sort -u > seg_clbll_mask_r.segbits
 	grep -h ^bit $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS)) | sort -u > seg_clblm_mask_l.segbits
 	grep -h ^bit $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS)) | sort -u > seg_clblm_mask_r.segbits
 
 pushdb:
-	bash ../../utils/mergedb.sh clbll_int_l seg_clbll_int_l.segbits
-	bash ../../utils/mergedb.sh clbll_int_r seg_clbll_int_r.segbits
-	bash ../../utils/mergedb.sh clblm_int_l seg_clblm_int_l.segbits
-	bash ../../utils/mergedb.sh clblm_int_r seg_clblm_int_r.segbits
-	bash ../../utils/mergedb.sh clbll_mask_l seg_clbll_mask_l.segbits
-	bash ../../utils/mergedb.sh clbll_mask_r seg_clbll_mask_r.segbits
-	bash ../../utils/mergedb.sh clblm_mask_l seg_clblm_mask_l.segbits
-	bash ../../utils/mergedb.sh clblm_mask_r seg_clblm_mask_r.segbits
+	${XRAY_MERGEDB} clbll_int_l seg_clbll_int_l.segbits
+	${XRAY_MERGEDB} clbll_int_r seg_clbll_int_r.segbits
+	${XRAY_MERGEDB} clblm_int_l seg_clblm_int_l.segbits
+	${XRAY_MERGEDB} clblm_int_r seg_clblm_int_r.segbits
+	${XRAY_MERGEDB} clbll_mask_l seg_clbll_mask_l.segbits
+	${XRAY_MERGEDB} clbll_mask_r seg_clbll_mask_r.segbits
+	${XRAY_MERGEDB} clblm_mask_l seg_clblm_mask_l.segbits
+	${XRAY_MERGEDB} clblm_mask_r seg_clblm_mask_r.segbits
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/013-intpips/generate.sh b/fuzzers/013-intpips/generate.sh
index 7ba5ce77..2ed94e31 100644
--- a/fuzzers/013-intpips/generate.sh
+++ b/fuzzers/013-intpips/generate.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source ../../utils/environment.sh
 source ${XRAY_GENHEADER}
 
 echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh