From a2f4ab208202772a0a5d13a57b202905991de587 Mon Sep 17 00:00:00 2001
From: Rick Altherr <kc8apf@kc8apf.net>
Date: Wed, 15 Nov 2017 11:35:55 -0500
Subject: [PATCH] minitests: fix tool paths

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
---
 minitests/clbconfigs/runme.sh   |  2 --
 minitests/ffcfg/Makefile        | 10 +++++-----
 minitests/ffcfg/runme.sh        |  2 --
 minitests/lvb_long_mux/runme.sh |  6 ++----
 minitests/switchboxes/runme.sh  |  2 --
 5 files changed, 7 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 minitests/clbconfigs/runme.sh
 mode change 100644 => 100755 minitests/lvb_long_mux/runme.sh
 mode change 100644 => 100755 minitests/switchboxes/runme.sh

diff --git a/minitests/clbconfigs/runme.sh b/minitests/clbconfigs/runme.sh
old mode 100644
new mode 100755
index dda3f8d0..0f016127
--- a/minitests/clbconfigs/runme.sh
+++ b/minitests/clbconfigs/runme.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source ../../utils/environment.sh
-
 set -ex
 vivado -mode batch -source runme.tcl
 ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
diff --git a/minitests/ffcfg/Makefile b/minitests/ffcfg/Makefile
index 03da3271..0ddf1bfa 100644
--- a/minitests/ffcfg/Makefile
+++ b/minitests/ffcfg/Makefile
@@ -6,13 +6,13 @@ all:
 	bash runme.sh
 
 database: $(SPECIMENS_OK)
-	../../tools/segmatch -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS))
 
 pushdb:
-	bash ../../utils/mergedb.sh clbll_l seg_clblx.segbits
-	bash ../../utils/mergedb.sh clbll_r seg_clblx.segbits
-	bash ../../utils/mergedb.sh clblm_l seg_clblx.segbits
-	bash ../../utils/mergedb.sh clblm_r seg_clblx.segbits
+	${XRAY_MERGEDDB} clbll_l seg_clblx.segbits
+	${XRAY_MERGEDDB} clbll_r seg_clblx.segbits
+	${XRAY_MERGEDDB} clblm_l seg_clblx.segbits
+	${XRAY_MERGEDDB} clblm_r seg_clblx.segbits
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/minitests/ffcfg/runme.sh b/minitests/ffcfg/runme.sh
index dda3f8d0..0f016127 100644
--- a/minitests/ffcfg/runme.sh
+++ b/minitests/ffcfg/runme.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source ../../utils/environment.sh
-
 set -ex
 vivado -mode batch -source runme.tcl
 ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
diff --git a/minitests/lvb_long_mux/runme.sh b/minitests/lvb_long_mux/runme.sh
old mode 100644
new mode 100755
index 1202185d..189e6359
--- a/minitests/lvb_long_mux/runme.sh
+++ b/minitests/lvb_long_mux/runme.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-source ../../utils/environment.sh
-
 set -ex
 vivado -mode batch -source runme.tcl
-${XRAY_BITREAD}-F $XRAY_ROI_FRAMES -o design_a.bits -z -y design_a.bit
-${XRAY_BITREAD}-F $XRAY_ROI_FRAMES -o design_b.bits -z -y design_b.bit
+${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design_a.bits -z -y design_a.bit
+${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design_b.bits -z -y design_b.bit
 ${XRAY_SEGPRINT} design_a.bits INT_L_X12Y132 INT_L_X14Y132 INT_L_X16Y132
 ${XRAY_SEGPRINT} design_b.bits INT_L_X12Y132 INT_L_X14Y132 INT_L_X16Y132
diff --git a/minitests/switchboxes/runme.sh b/minitests/switchboxes/runme.sh
old mode 100644
new mode 100755
index 07a615ea..57c02d4f
--- a/minitests/switchboxes/runme.sh
+++ b/minitests/switchboxes/runme.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source ../../utils/environment.sh
-
 vivado -mode batch -source runme.tcl
 ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
 ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o routes.bits -z -y routes.bit