epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Use @TOP@ and @ARCH@ in .plt files

Browse Source 
No need for msi-copy(.exe) as a result.
Tests should now work with INSTALL_LOCATION set, and
don't need to use databaseModuleDirs either.
This commit is contained in:
Andrew Johnson
2017-09-22 14:27:14 -05:00
parent 9be4d01e8a
commit 044b7a31ef
13 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/ioc/dbtemplate/Makefile
View File

@@ -18,11 +18,4 @@ 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)
@$(RM) $@
$(CP) $< $@

4
test/ioc/dbtemplate/msi.plt
View File

@@ -63,8 +63,8 @@ sub slurp {
sub msi {
my ($args) = @_;
my $exe = ($^O eq 'MSWin32') || ($^O eq 'cygwin') ? '.exe' : '';
my $msi = "./msi-copy$exe";
my $msi = '@TOP@/bin/@ARCH@/msi';
$msi .= '.exe' if ($^O eq 'MSWin32') || ($^O eq 'cygwin');
my $result;
if ($args =~ m/-o / && $args !~ m/-D/) {
# An empty result is expected

3
test/tools/Breaktable.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 9;

3
test/tools/DBD.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 18;

3
test/tools/Device.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 16;

3
test/tools/Driver.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 2;

3
test/tools/Function.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 2;

3
test/tools/Makefile
View File

@@ -22,6 +22,3 @@ TESTS += Variable
TESTSCRIPTS_HOST += $(TESTS:%=%.t)
include $(TOP)/configure/RULES
# Create local copy else out-of-tree installs break the scripts
$(TESTSCRIPTS_HOST) : $(COMMON_DIR)/databaseModuleDirs.pm

3
test/tools/Menu.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 14;

3
test/tools/Recfield.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 76;

3
test/tools/Recordtype.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 17;

3
test/tools/Registrar.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 2;

3
test/tools/Variable.plt
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env perl
use lib '../O.Common';
use databaseModuleDirs;
use lib '@TOP@/lib/perl';
use Test::More tests => 4;