Commit 2301093f authored by Daniel Black's avatar Daniel Black

MDEV-25894: support AIX as a platform in mtr

Parital backport of 48938c57
so platform dependent AIX tests can be done.
parent c7443a09
...@@ -22,7 +22,7 @@ use File::Basename; ...@@ -22,7 +22,7 @@ use File::Basename;
use File::Path; use File::Path;
use base qw(Exporter); use base qw(Exporter);
our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL IS_AIX
native_path posix_path mixed_path native_path posix_path mixed_path
check_socket_path_length process_alive open_for_append); check_socket_path_length process_alive open_for_append);
...@@ -54,6 +54,15 @@ BEGIN { ...@@ -54,6 +54,15 @@ BEGIN {
} }
} }
BEGIN {
if ($^O eq "aix") {
eval 'sub IS_AIX { 1 }';
}
else {
eval 'sub IS_AIX { 0 }';
}
}
# #
# native_path # native_path
......
...@@ -17,7 +17,13 @@ sub skip_combinations { ...@@ -17,7 +17,13 @@ sub skip_combinations {
unless $ENV{DEBUG_KEY_MANAGEMENT_SO}; unless $ENV{DEBUG_KEY_MANAGEMENT_SO};
# don't run tests for the wrong platform # don't run tests for the wrong platform
$skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ]; if (IS_WINDOWS) {
$skip{'include/platform.combinations'} = [ 'aix', 'unix' ];
} elsif (IS_AIX) {
$skip{'include/platform.combinations'} = [ 'win', 'unix' ];
} else {
$skip{'include/platform.combinations'} = [ 'aix', 'win' ];
}
$skip{'include/maybe_debug.combinations'} = $skip{'include/maybe_debug.combinations'} =
[ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ]; [ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment