diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm new file mode 100644 index 00000000000..1e2fb50d6da --- /dev/null +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -0,0 +1,16 @@ + +# Copyright (c) 2022, PostgreSQL Global Development Group + +# allow use of release 15+ perl namespace in older branches +# just 'use' the older module name. +# See PostgresNode.pm for function implementations + +package PostgreSQL::Test::Cluster; + +use strict; +use warnings; + +use PostgresNode; + +1; + diff --git a/src/test/perl/PostgreSQL/Test/Utils.pm b/src/test/perl/PostgreSQL/Test/Utils.pm new file mode 100644 index 00000000000..1f922e77486 --- /dev/null +++ b/src/test/perl/PostgreSQL/Test/Utils.pm @@ -0,0 +1,40 @@ +# Copyright (c) 2022, PostgreSQL Global Development Group + +# allow use of release 15+ perl namespace in older branches +# just 'use' the older module name. +# We export the same names as the v15 module. +# See TestLib.pm for alias assignment that makes this all work. + +package PostgreSQL::Test::Utils; + +use strict; +use warnings; + +use Exporter 'import'; + +use TestLib; + +our @EXPORT = qw( + generate_ascii_string + slurp_dir + slurp_file + append_to_file + system_or_bail + system_log + run_log + + command_ok + command_fails + command_exit_is + program_help_ok + program_version_ok + program_options_handling_ok + command_like + command_like_safe + command_fails_like + command_checks_all + + $windows_os +); + +1; diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm index d673494e889..29a5e883536 100644 --- a/src/test/perl/PostgresNode.pm +++ b/src/test/perl/PostgresNode.pm @@ -2098,4 +2098,14 @@ sub pg_recvlogical_upto =cut +# support release 15+ perl module namespace + +package PostgreSQL::Test::Cluster; ## no critic (ProhibitMultiplePackages) + +sub new +{ + shift; # remove class param from args + return PostgresNode->get_new_node(@_); +} + 1; diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index 73db8f43406..f94a71cd8e3 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -41,6 +41,7 @@ our @EXPORT = qw( command_like command_like_safe command_fails_like + command_checks_all $windows_os ); @@ -453,4 +454,39 @@ sub command_checks_all return; } +# support release 15+ perl module namespace + +package PostgreSQL::Test::Utils; ## no critic (ProhibitMultiplePackages) + +# we don't want to export anything here, but we want to support things called +# via this package name explicitly. + +# use typeglobs to alias these functions and variables + +no warnings qw(once); + +*generate_ascii_string = *TestLib::generate_ascii_string; +*slurp_dir = *TestLib::slurp_dir; +*slurp_file = *TestLib::slurp_file; +*append_to_file = *TestLib::append_to_file; +*system_or_bail = *TestLib::system_or_bail; +*system_log = *TestLib::system_log; +*run_log = *TestLib::run_log; +*command_ok = *TestLib::command_ok; +*command_fails = *TestLib::command_fails; +*command_exit_is = *TestLib::command_exit_is; +*program_help_ok = *TestLib::program_help_ok; +*program_version_ok = *TestLib::program_version_ok; +*program_options_handling_ok = *TestLib::program_options_handling_ok; +*command_like = *TestLib::command_like; +*command_like_safe = *TestLib::command_like_safe; +*command_fails_like = *TestLib::command_fails_like; +*command_checks_all = *TestLib::command_checks_all; + +*windows_os = *TestLib::windows_os; +*timeout_default = *TestLib::timeout_default; +*tmp_check = *TestLib::tmp_check; +*log_path = *TestLib::log_path; +*test_logfile = *TestLib::test_log_file; + 1;