From 044b7a31ef0220cee63e0b0fd3d4c964decc30dc Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 22 Sep 2017 14:27:14 -0500 Subject: [PATCH] Use @TOP@ and @ARCH@ in .plt files 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. --- test/ioc/dbtemplate/Makefile | 7 ------- test/ioc/dbtemplate/msi.plt | 4 ++-- test/tools/Breaktable.plt | 3 +-- test/tools/DBD.plt | 3 +-- test/tools/Device.plt | 3 +-- test/tools/Driver.plt | 3 +-- test/tools/Function.plt | 3 +-- test/tools/Makefile | 3 --- test/tools/Menu.plt | 3 +-- test/tools/Recfield.plt | 3 +-- test/tools/Recordtype.plt | 3 +-- test/tools/Registrar.plt | 3 +-- test/tools/Variable.plt | 3 +-- 13 files changed, 12 insertions(+), 32 deletions(-) diff --git a/test/ioc/dbtemplate/Makefile b/test/ioc/dbtemplate/Makefile index ff861695b..4442a4ff8 100644 --- a/test/ioc/dbtemplate/Makefile +++ b/test/ioc/dbtemplate/Makefile @@ -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) $< $@ diff --git a/test/ioc/dbtemplate/msi.plt b/test/ioc/dbtemplate/msi.plt index bd663070f..ab49fd9cd 100644 --- a/test/ioc/dbtemplate/msi.plt +++ b/test/ioc/dbtemplate/msi.plt @@ -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 diff --git a/test/tools/Breaktable.plt b/test/tools/Breaktable.plt index 4caf47e1f..e7d9ae904 100644 --- a/test/tools/Breaktable.plt +++ b/test/tools/Breaktable.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 9; diff --git a/test/tools/DBD.plt b/test/tools/DBD.plt index ec75cbda5..4ecba0c2c 100644 --- a/test/tools/DBD.plt +++ b/test/tools/DBD.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 18; diff --git a/test/tools/Device.plt b/test/tools/Device.plt index 95be70031..7ef85e5ce 100644 --- a/test/tools/Device.plt +++ b/test/tools/Device.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 16; diff --git a/test/tools/Driver.plt b/test/tools/Driver.plt index 7d43b87e8..c1bf062ee 100644 --- a/test/tools/Driver.plt +++ b/test/tools/Driver.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 2; diff --git a/test/tools/Function.plt b/test/tools/Function.plt index d599d99a3..8c17e27ca 100644 --- a/test/tools/Function.plt +++ b/test/tools/Function.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 2; diff --git a/test/tools/Makefile b/test/tools/Makefile index d72c00539..b9749a5c4 100644 --- a/test/tools/Makefile +++ b/test/tools/Makefile @@ -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 diff --git a/test/tools/Menu.plt b/test/tools/Menu.plt index 4dcc1f541..3d4f3f951 100644 --- a/test/tools/Menu.plt +++ b/test/tools/Menu.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 14; diff --git a/test/tools/Recfield.plt b/test/tools/Recfield.plt index d0e8289e3..7f93e9265 100644 --- a/test/tools/Recfield.plt +++ b/test/tools/Recfield.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 76; diff --git a/test/tools/Recordtype.plt b/test/tools/Recordtype.plt index fc3d066a5..ec189a92c 100644 --- a/test/tools/Recordtype.plt +++ b/test/tools/Recordtype.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 17; diff --git a/test/tools/Registrar.plt b/test/tools/Registrar.plt index f1a5c9e3d..b5f4d46d0 100644 --- a/test/tools/Registrar.plt +++ b/test/tools/Registrar.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 2; diff --git a/test/tools/Variable.plt b/test/tools/Variable.plt index 00094a328..120732050 100644 --- a/test/tools/Variable.plt +++ b/test/tools/Variable.plt @@ -1,7 +1,6 @@ #!/usr/bin/env perl -use lib '../O.Common'; -use databaseModuleDirs; +use lib '@TOP@/lib/perl'; use Test::More tests => 4;