diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_stress.pl | 2 | ||||
| -rw-r--r-- | mysql-test/lib/v1/mtr_stress.pl | 2 | ||||
| -rwxr-xr-x | mysql-test/mariadb-stress-test.pl (renamed from mysql-test/mysql-stress-test.pl) | 0 | ||||
| -rwxr-xr-x | mysql-test/mariadb-test-run.pl (renamed from mysql-test/mysql-test-run.pl) | 8 | ||||
| -rw-r--r-- | mysql-test/suite/stress/t/wrapper.test | 2 |
6 files changed, 15 insertions, 10 deletions
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt index 7487e301df5..d21f4ce6e17 100644 --- a/mysql-test/CMakeLists.txt +++ b/mysql-test/CMakeLists.txt @@ -27,16 +27,21 @@ IF(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) ENDIF() IF(UNIX) EXECUTE_PROCESS( - COMMAND chmod +x mysql-test-run.pl + COMMAND chmod +x mariadb-test-run.pl + COMMAND ${CMAKE_COMMAND} -E create_symlink + ./mariadb-stress-test.pl mysql-stress-test.pl COMMAND ${CMAKE_COMMAND} -E create_symlink - ./mysql-test-run.pl mtr + ./mariadb-test-run.pl mysql-test-run.pl COMMAND ${CMAKE_COMMAND} -E create_symlink - ./mysql-test-run.pl mysql-test-run + ./mariadb-test-run.pl mysql-test-run + COMMAND ${CMAKE_COMMAND} -E create_symlink + ./mariadb-test-run.pl mtr WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) IF(INSTALL_MYSQLTESTDIR AND out_of_source_build) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mtr ${CMAKE_CURRENT_BINARY_DIR}/mysql-test-run + ${CMAKE_CURRENT_BINARY_DIR}/mysql-test-run.pl DESTINATION ${INSTALL_MYSQLTESTDIR} COMPONENT Test) ENDIF() diff --git a/mysql-test/lib/mtr_stress.pl b/mysql-test/lib/mtr_stress.pl index 3a9ca8fafcc..526307661c7 100644 --- a/mysql-test/lib/mtr_stress.pl +++ b/mysql-test/lib/mtr_stress.pl @@ -136,7 +136,7 @@ sub run_stress_test () } mtr_init_args(\$args); - mtr_add_args($args, "$::glob_mysql_test_dir/mysql-stress-test.pl"); + mtr_add_args($args, "$::glob_mysql_test_dir/mariadb-stress-test.pl"); mtr_add_arg($args, "--server-socket=%s", $::master->[0]->{'path_sock'}); mtr_add_arg($args, "--server-user=%s", $::opt_user); mtr_add_arg($args, "--server-database=%s", "test"); diff --git a/mysql-test/lib/v1/mtr_stress.pl b/mysql-test/lib/v1/mtr_stress.pl index c248b8089c6..032604538f3 100644 --- a/mysql-test/lib/v1/mtr_stress.pl +++ b/mysql-test/lib/v1/mtr_stress.pl @@ -182,7 +182,7 @@ sub run_stress_test () } #Run stress test - mtr_run("$::glob_mysql_test_dir/mysql-stress-test.pl", $args, "", "", "", ""); + mtr_run("$::glob_mysql_test_dir/mariadb-stress-test.pl", $args, "", "", "", ""); if ( ! $::glob_use_embedded_server ) { stop_all_servers(); diff --git a/mysql-test/mysql-stress-test.pl b/mysql-test/mariadb-stress-test.pl index 3ccf965024d..3ccf965024d 100755 --- a/mysql-test/mysql-stress-test.pl +++ b/mysql-test/mariadb-stress-test.pl diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mariadb-test-run.pl index 726712dbd2d..3f165b642f8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mariadb-test-run.pl @@ -35,7 +35,7 @@ use warnings; BEGIN { # Check that mysql-test-run.pl is started from mysql-test/ - unless ( -f "mysql-test-run.pl" ) + unless ( -f "mariadb-test-run.pl" ) { print "**** ERROR **** ", "You must start mysql-test-run from the mysql-test/ directory\n"; @@ -59,10 +59,10 @@ BEGIN { if ( $version == 1 ) { print "=======================================================\n"; - print " WARNING: Using mysql-test-run.pl version 1! \n"; + print " WARNING: Using mariadb-test-run.pl version 1! \n"; print "=======================================================\n"; # Should use exec() here on *nix but this appears not to work on Windows - exit(system($^X, "lib/v1/mysql-test-run.pl", @ARGV) >> 8); + exit(system($^X, "lib/v1/mariadb-test-run.pl", @ARGV) >> 8); } elsif ( $version == 2 ) { @@ -71,7 +71,7 @@ BEGIN { } else { - print "ERROR: Version $version of mysql-test-run does not exist!\n"; + print "ERROR: Version $version of mariadb-test-run does not exist!\n"; exit(1); } } diff --git a/mysql-test/suite/stress/t/wrapper.test b/mysql-test/suite/stress/t/wrapper.test index 4d2dd808a4c..7a468985570 100644 --- a/mysql-test/suite/stress/t/wrapper.test +++ b/mysql-test/suite/stress/t/wrapper.test @@ -20,7 +20,7 @@ EOF --source $MYSQL_TMP_DIR/mtest.inc --remove_file $MYSQL_TMP_DIR/mtest.inc -exec perl mysql-stress-test.pl --mysqltest=$MYSQLTEST_BIN +exec perl mariadb-stress-test.pl --mysqltest=$MYSQLTEST_BIN --server-port=$MASTER_MYPORT --server-socket=$MASTER_MYSOCK --server-user=root --cleanup --server-logs-dir=$MYSQLTEST_VARDIR/log |