mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan
mysql-test/mysql-test-run.pl: 1. Improved description of option user=USER 2. Bug fix The storage place of the old, to be removed <test case>.reject file is the 'r' subdirectory of the test suite. 3. New option "start-dirty" which is - per functionality a "start-and-exit" without an initiation - a convenient method to (re)start an existing database. So a following ./mysql-test-run.pl --extern ...... will meet a server running with the default ports and sockets according to our test environment. This option is useful for analyzing bugs and WL#2520 Upgrade/Downgrade Test Plan .
This commit is contained in:
@ -262,6 +262,7 @@ our $opt_socket;
|
|||||||
our $opt_source_dist;
|
our $opt_source_dist;
|
||||||
|
|
||||||
our $opt_start_and_exit;
|
our $opt_start_and_exit;
|
||||||
|
our $opt_start_dirty;
|
||||||
our $opt_start_from;
|
our $opt_start_from;
|
||||||
|
|
||||||
our $opt_strace_client;
|
our $opt_strace_client;
|
||||||
@ -305,6 +306,7 @@ sub initial_setup ();
|
|||||||
sub command_line_setup ();
|
sub command_line_setup ();
|
||||||
sub executable_setup ();
|
sub executable_setup ();
|
||||||
sub environment_setup ();
|
sub environment_setup ();
|
||||||
|
sub kill_running_server ();
|
||||||
sub kill_and_cleanup ();
|
sub kill_and_cleanup ();
|
||||||
sub ndbcluster_install ();
|
sub ndbcluster_install ();
|
||||||
sub ndbcluster_start ();
|
sub ndbcluster_start ();
|
||||||
@ -353,14 +355,22 @@ sub main () {
|
|||||||
|
|
||||||
if ( ! $glob_use_running_server )
|
if ( ! $glob_use_running_server )
|
||||||
{
|
{
|
||||||
kill_and_cleanup();
|
|
||||||
mysql_install_db();
|
if ( $opt_start_dirty )
|
||||||
|
{
|
||||||
|
kill_running_server();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
kill_and_cleanup();
|
||||||
|
mysql_install_db();
|
||||||
|
|
||||||
# mysql_loadstd(); FIXME copying from "std_data" .frm and
|
# mysql_loadstd(); FIXME copying from "std_data" .frm and
|
||||||
# .MGR but there are none?!
|
# .MGR but there are none?!
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $opt_start_and_exit )
|
if ( $opt_start_and_exit or $opt_start_dirty )
|
||||||
{
|
{
|
||||||
if ( ndbcluster_start() )
|
if ( ndbcluster_start() )
|
||||||
{
|
{
|
||||||
@ -531,6 +541,7 @@ sub command_line_setup () {
|
|||||||
'script-debug' => \$opt_script_debug,
|
'script-debug' => \$opt_script_debug,
|
||||||
'sleep=i' => \$opt_sleep,
|
'sleep=i' => \$opt_sleep,
|
||||||
'socket=s' => \$opt_socket,
|
'socket=s' => \$opt_socket,
|
||||||
|
'start-dirty' => \$opt_start_dirty,
|
||||||
'start-and-exit' => \$opt_start_and_exit,
|
'start-and-exit' => \$opt_start_and_exit,
|
||||||
'start-from=s' => \$opt_start_from,
|
'start-from=s' => \$opt_start_from,
|
||||||
'timer' => \$opt_timer,
|
'timer' => \$opt_timer,
|
||||||
@ -951,7 +962,7 @@ sub handle_int_signal () {
|
|||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
sub kill_and_cleanup () {
|
sub kill_running_server () {
|
||||||
|
|
||||||
if ( $opt_fast or $glob_use_embedded_server )
|
if ( $opt_fast or $glob_use_embedded_server )
|
||||||
{
|
{
|
||||||
@ -976,6 +987,11 @@ sub kill_and_cleanup () {
|
|||||||
ndbcluster_stop();
|
ndbcluster_stop();
|
||||||
$master->[0]->{'ndbcluster'}= 1;
|
$master->[0]->{'ndbcluster'}= 1;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sub kill_and_cleanup () {
|
||||||
|
|
||||||
|
kill_running_server ();
|
||||||
|
|
||||||
mtr_report("Removing Stale Files");
|
mtr_report("Removing Stale Files");
|
||||||
|
|
||||||
@ -1464,7 +1480,15 @@ sub run_testcase ($) {
|
|||||||
# ----------------------------------------------------------------------
|
# ----------------------------------------------------------------------
|
||||||
|
|
||||||
{
|
{
|
||||||
unlink("r/$tname.reject");
|
# remove the old reject file
|
||||||
|
if ( $opt_suite eq "main" )
|
||||||
|
{
|
||||||
|
unlink("r/$tname.reject");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unlink("suite/$opt_suite/r/$tname.reject");
|
||||||
|
}
|
||||||
unlink($path_timefile);
|
unlink($path_timefile);
|
||||||
|
|
||||||
my $res= run_mysqltest($tinfo, $tinfo->{'master_opt'});
|
my $res= run_mysqltest($tinfo, $tinfo->{'master_opt'});
|
||||||
@ -2158,7 +2182,7 @@ Options to run test on running server
|
|||||||
|
|
||||||
extern Use running server for tests FIXME DANGEROUS
|
extern Use running server for tests FIXME DANGEROUS
|
||||||
ndbconnectstring=STR Use running cluster, and connect using STR
|
ndbconnectstring=STR Use running cluster, and connect using STR
|
||||||
user=USER The databse user name
|
user=USER User for connect to server
|
||||||
|
|
||||||
Options for debugging the product
|
Options for debugging the product
|
||||||
|
|
||||||
@ -2185,6 +2209,7 @@ Misc options
|
|||||||
compress Use the compressed protocol between client and server
|
compress Use the compressed protocol between client and server
|
||||||
timer Show test case execution time
|
timer Show test case execution time
|
||||||
start-and-exit Only initiate and start the "mysqld" servers
|
start-and-exit Only initiate and start the "mysqld" servers
|
||||||
|
start-dirty Only start the "mysqld" servers without initiation
|
||||||
fast Don't try to cleanup from earlier runs
|
fast Don't try to cleanup from earlier runs
|
||||||
reorder Reorder tests to get less server restarts
|
reorder Reorder tests to get less server restarts
|
||||||
help Get this help text
|
help Get this help text
|
||||||
|
Reference in New Issue
Block a user