From cc656981c066f5ca60900dcd4fbb80bb6ee105a2 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 4 Aug 2014 15:39:02 -0500
Subject: [PATCH] MSI testing

When testing the msi program, don't rely on EPICS_HOST_ARCH
to find the binary executable as we may be running the tests
on a cross-arch such as linux-x86-debug.
---
 src/ioc/dbtemplate/test/Makefile | 6 ++++++
 src/ioc/dbtemplate/test/msi.plt  | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ioc/dbtemplate/test/Makefile b/src/ioc/dbtemplate/test/Makefile
index 94c6613cb..27bb17ac0 100644
--- a/src/ioc/dbtemplate/test/Makefile
+++ b/src/ioc/dbtemplate/test/Makefile
@@ -17,5 +17,11 @@ TESTS += msi
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
 
+TARGETS_HOST += msi-copy$(EXE)
+TARGETS += $(TARGETS_$(BUILD_CLASS))
+
 include $(TOP)/configure/RULES
 
+msi-copy$(EXE): $(INSTALL_BIN)/msi$(EXE) ../Makefile
+	@$(RM) $@
+	$(CP) $< $@
diff --git a/src/ioc/dbtemplate/test/msi.plt b/src/ioc/dbtemplate/test/msi.plt
index e0104dbb3..7d8aab7b2 100644
--- a/src/ioc/dbtemplate/test/msi.plt
+++ b/src/ioc/dbtemplate/test/msi.plt
@@ -8,8 +8,6 @@
 
 # Script to run tests on the msi program
 
-use FindBin qw($Bin);   # To find the msi executable
-
 use strict;
 use Test;
 
@@ -41,8 +39,7 @@ sub slurp {
 
 sub msi {
     my ($args) = @_;
-    my $arch = $ENV{EPICS_HOST_ARCH};
     my $exe = ($^O eq 'MSWin32') || ($^O eq 'cygwin') ? '.exe' : '';
-    my $msi = "$Bin/../../../O.$arch/msi$exe";
+    my $msi = "./msi-copy$exe";
     return `$msi $args`;
 }