diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-06-11 17:13:19 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-07-02 14:46:05 +1000 |
| commit | 3f2c4758b07227ed6658f0ccc491b747dfd7aa54 (patch) | |
| tree | b5690ee7908a95bd81ce0e49b3e92159a6275dd8 | |
| parent | 4a6e2d343745c11086c05f0041a8267591bb073c (diff) | |
| download | mariadb-git-3f2c4758b07227ed6658f0ccc491b747dfd7aa54.tar.gz | |
MDEV-25894: support AIX as a platform in mtr
Parital backport of 48938c57c7f75b2a7627212b01cd65cfd6830261
so platform dependent AIX tests can be done.
| -rw-r--r-- | mysql-test/include/platform.combinations | 2 | ||||
| -rw-r--r-- | mysql-test/lib/My/Platform.pm | 11 | ||||
| -rw-r--r-- | mysql-test/main/mysqld--help,aix.rdiff | 0 | ||||
| -rw-r--r-- | mysql-test/suite.pm | 8 |
4 files changed, 19 insertions, 2 deletions
diff --git a/mysql-test/include/platform.combinations b/mysql-test/include/platform.combinations index 4681ac05314..4f0660b7a40 100644 --- a/mysql-test/include/platform.combinations +++ b/mysql-test/include/platform.combinations @@ -1,4 +1,6 @@ [win] +[aix] + [unix] diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index db1206f187e..b8bc9f8ec84 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -22,7 +22,7 @@ use File::Basename; use File::Path; 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 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 diff --git a/mysql-test/main/mysqld--help,aix.rdiff b/mysql-test/main/mysqld--help,aix.rdiff new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/mysql-test/main/mysqld--help,aix.rdiff diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 2617f95d989..b76a50716cc 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -17,7 +17,13 @@ sub skip_combinations { unless $ENV{DEBUG_KEY_MANAGEMENT_SO}; # 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'} = [ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ]; |