diff options
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 12 | ||||
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index ebdc8fa9f98..631a5d8c348 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -982,6 +982,17 @@ sub collect_one_test_case { } } + if ( $tinfo->{'need_ipv6'} ) + { + # This is a test that needs ssl + if ( ! $::have_ipv6 ) { + # IPv6 is not supported, skip it + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "No IPv6"; + return $tinfo; + } + } + # ---------------------------------------------------------------------- # Find config file to use if not already selected in <testname>.opt file # ---------------------------------------------------------------------- @@ -1075,6 +1086,7 @@ my @tags= ["include/have_example_plugin.inc", "example_plugin_test", 1], ["include/have_oqgraph_engine.inc", "oqgraph_test", 1], ["include/have_ssl.inc", "need_ssl", 1], + ["include/check_ipv6.inc", "need_ipv6", 1], ); diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index e4743c73d6b..1d72303b839 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -2158,7 +2158,6 @@ sub environment_setup () { # ---------------------------------------------------- $ENV{'MY_PERROR'}= mtr_native_path($exe_perror); -#warning remove the below # ---------------------------------------------------- # Add the path where mysqld will find udf_example.so # ---------------------------------------------------- |