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.
This commit is contained in:
Andrew Johnson
2014-08-04 15:39:02 -05:00
parent aedea0da37
commit cc656981c0
2 changed files with 7 additions and 4 deletions

View File

@@ -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) $< $@

View File

@@ -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`;
}