database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-25894: support AIX as a platform in mtr

Browse Source 
Parital backport of 48938c57c7
so platform dependent AIX tests can be done.
This commit is contained in:
Daniel Black
2021-06-11 17:13:19 +10:00
parent c7443a0911
commit 2301093f8f
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/platform.combinations
View File

@ -1,4 +1,6 @@
[win] [win]
[aix]
[unix] [unix]

11
mysql-test/lib/My/Platform.pm
View File

@ -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 {
} }
} }
BEGIN {
if ($^O eq "aix") {
eval 'sub IS_AIX { 1 }';
}
else {
eval 'sub IS_AIX { 0 }';
}
}
# #
# native_path # native_path

0
mysql-test/main/mysqld--help,aix.rdiff Normal file
View File

8
mysql-test/suite.pm
View File

@ -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' ];