mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Merge bk-internal:/home/bk/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
This commit is contained in:
unknown
commit
0bfad0da5c
2 changed files with 47 additions and 70 deletions
|
|
@ -593,6 +593,10 @@ sub mtr_options_from_test_file($$) {
|
|||
|
||||
while ( my $line= <$F> )
|
||||
{
|
||||
|
||||
# Skip line if it start's with #
|
||||
next if ( $line =~ /^#/ );
|
||||
|
||||
# Match this line against tag in "tags" array
|
||||
foreach my $tag (@tags)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -97,11 +97,6 @@ $Devel::Trace::TRACE= 1;
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
# We are to use handle_options() in "mysys/my_getopt.c" for the C version
|
||||
#
|
||||
# In the C version we want to use structs and, in some cases, arrays of
|
||||
# structs. We let each struct be a separate hash.
|
||||
|
||||
# Misc global variables
|
||||
our $mysql_version_id;
|
||||
our $glob_mysql_test_dir= undef;
|
||||
|
|
@ -109,7 +104,6 @@ our $glob_mysql_bench_dir= undef;
|
|||
our $glob_hostname= undef;
|
||||
our $glob_scriptname= undef;
|
||||
our $glob_timers= undef;
|
||||
our $glob_use_running_server= 0;
|
||||
our $glob_use_running_ndbcluster= 0;
|
||||
our $glob_use_running_ndbcluster_slave= 0;
|
||||
our $glob_use_embedded_server= 0;
|
||||
|
|
@ -168,7 +162,7 @@ our $exe_libtool;
|
|||
|
||||
our $opt_bench= 0;
|
||||
our $opt_small_bench= 0;
|
||||
our $opt_big_test= 0; # Send --big-test to mysqltest
|
||||
our $opt_big_test= 0;
|
||||
|
||||
our @opt_extra_mysqld_opt;
|
||||
|
||||
|
|
@ -185,7 +179,10 @@ our $opt_debug;
|
|||
our $opt_do_test;
|
||||
our @opt_cases; # The test cases names in argv
|
||||
our $opt_embedded_server;
|
||||
our $opt_extern;
|
||||
|
||||
our $opt_extern= 0;
|
||||
our $opt_socket;
|
||||
|
||||
our $opt_fast;
|
||||
our $opt_force;
|
||||
our $opt_reorder= 0;
|
||||
|
|
@ -236,15 +233,11 @@ our $opt_skip_im;
|
|||
|
||||
our $opt_sleep;
|
||||
|
||||
our $opt_sleep_time_after_restart= 1;
|
||||
our $opt_sleep_time_for_delete= 10;
|
||||
our $opt_testcase_timeout;
|
||||
our $opt_suite_timeout;
|
||||
my $default_testcase_timeout= 15; # 15 min max
|
||||
my $default_suite_timeout= 180; # 3 hours max
|
||||
|
||||
our $opt_socket;
|
||||
|
||||
our $opt_source_dist;
|
||||
|
||||
our $opt_start_and_exit;
|
||||
|
|
@ -256,7 +249,6 @@ our $opt_strace_client;
|
|||
our $opt_timer= 1;
|
||||
|
||||
our $opt_user;
|
||||
our $opt_user_test;
|
||||
|
||||
our $opt_valgrind= 0;
|
||||
our $opt_valgrind_mysqld= 0;
|
||||
|
|
@ -278,7 +270,6 @@ our $opt_stress_test_file= "";
|
|||
|
||||
our $opt_wait_for_master;
|
||||
our $opt_wait_for_slave;
|
||||
our $opt_wait_timeout= 10;
|
||||
|
||||
our $opt_warnings;
|
||||
|
||||
|
|
@ -613,9 +604,7 @@ sub command_line_setup () {
|
|||
'start-and-exit' => \$opt_start_and_exit,
|
||||
'timer!' => \$opt_timer,
|
||||
'unified-diff|udiff' => \$opt_udiff,
|
||||
'user-test=s' => \$opt_user_test,
|
||||
'user=s' => \$opt_user,
|
||||
'wait-timeout=i' => \$opt_wait_timeout,
|
||||
'testcase-timeout=i' => \$opt_testcase_timeout,
|
||||
'suite-timeout=i' => \$opt_suite_timeout,
|
||||
'warnings|log-warnings' => \$opt_warnings,
|
||||
|
|
@ -805,14 +794,6 @@ sub command_line_setup () {
|
|||
$opt_tmpdir= "$opt_vardir/tmp" unless $opt_tmpdir;
|
||||
$opt_tmpdir =~ s,/+$,,; # Remove ending slash if any
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Set socket
|
||||
# --------------------------------------------------------------------------
|
||||
if (!$opt_socket)
|
||||
{
|
||||
$opt_socket= $mysqld_variables{'socket'};
|
||||
}
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Check im suport
|
||||
# --------------------------------------------------------------------------
|
||||
|
|
@ -910,11 +891,11 @@ sub command_line_setup () {
|
|||
}
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Sleep flag
|
||||
# Big test flags
|
||||
# --------------------------------------------------------------------------
|
||||
if ( $opt_sleep )
|
||||
if ( $opt_big_test )
|
||||
{
|
||||
$opt_sleep_time_after_restart= $opt_sleep;
|
||||
$ENV{'BIG_TEST'}= 1;
|
||||
}
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
|
|
@ -934,8 +915,6 @@ sub command_line_setup () {
|
|||
{
|
||||
# Indicate that we are using debugger
|
||||
$glob_debugger= 1;
|
||||
# Increase timeouts
|
||||
$opt_wait_timeout= 300;
|
||||
if ( $opt_extern )
|
||||
{
|
||||
mtr_error("Can't use --extern when using debugger");
|
||||
|
|
@ -1001,16 +980,9 @@ sub command_line_setup () {
|
|||
$opt_suite_timeout*= 6 if $opt_valgrind;
|
||||
}
|
||||
|
||||
# Increase times to wait for executables to start if using valgrind
|
||||
if ( $opt_valgrind )
|
||||
{
|
||||
$opt_sleep_time_after_restart= 10;
|
||||
$opt_sleep_time_for_delete= 60;
|
||||
}
|
||||
|
||||
if ( ! $opt_user )
|
||||
{
|
||||
if ( $glob_use_running_server )
|
||||
if ( $opt_extern )
|
||||
{
|
||||
$opt_user= "test";
|
||||
}
|
||||
|
|
@ -1192,9 +1164,16 @@ sub command_line_setup () {
|
|||
|
||||
if ( $opt_extern )
|
||||
{
|
||||
$glob_use_running_server= 1;
|
||||
$opt_skip_rpl= 1; # We don't run rpl test cases
|
||||
$master->[0]->{'path_sock'}= $opt_socket;
|
||||
# Turn off features not supported when running with extern server
|
||||
$opt_skip_rpl= 1;
|
||||
|
||||
# Setup master->[0] with the settings for the extern server
|
||||
$master->[0]->{'path_sock'}= $opt_socket if $opt_socket;
|
||||
}
|
||||
else
|
||||
{
|
||||
mtr_error("--socket can only be used in combination with --extern")
|
||||
if $opt_socket;
|
||||
}
|
||||
|
||||
$path_timefile= "$opt_vardir/log/mysqltest-time";
|
||||
|
|
@ -1604,7 +1583,7 @@ sub environment_setup () {
|
|||
$ENV{'UMASK'}= "0660"; # The octal *string*
|
||||
$ENV{'UMASK_DIR'}= "0770"; # The octal *string*
|
||||
$ENV{'LC_COLLATE'}= "C";
|
||||
$ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;
|
||||
$ENV{'USE_RUNNING_SERVER'}= $opt_extern;
|
||||
$ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir;
|
||||
$ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
|
||||
$ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
|
||||
|
|
@ -2499,7 +2478,7 @@ sub run_suite () {
|
|||
mtr_print_line();
|
||||
|
||||
if ( ! $glob_debugger and
|
||||
! $glob_use_running_server and
|
||||
! $opt_extern and
|
||||
! $glob_use_embedded_server )
|
||||
{
|
||||
stop_all_servers();
|
||||
|
|
@ -2530,7 +2509,7 @@ sub initialize_servers () {
|
|||
|
||||
datadir_setup();
|
||||
|
||||
if ( ! $glob_use_running_server )
|
||||
if ( ! $opt_extern )
|
||||
{
|
||||
kill_running_servers();
|
||||
|
||||
|
|
@ -3062,7 +3041,7 @@ sub run_testcase ($) {
|
|||
if ($master_restart or $slave_restart)
|
||||
{
|
||||
# Can't restart a running server that may be in use
|
||||
if ( $glob_use_running_server )
|
||||
if ( $opt_extern )
|
||||
{
|
||||
mtr_report_test_name($tinfo);
|
||||
$tinfo->{comment}= "Can't restart a running server";
|
||||
|
|
@ -3241,7 +3220,7 @@ sub report_failure_and_restart ($) {
|
|||
print "Aborting: $tinfo->{'name'} failed in $test_mode mode. ";
|
||||
print "To continue, re-run with '--force'.\n";
|
||||
if ( ! $glob_debugger and
|
||||
! $glob_use_running_server and
|
||||
! $opt_extern and
|
||||
! $glob_use_embedded_server )
|
||||
{
|
||||
stop_all_servers();
|
||||
|
|
@ -3816,11 +3795,18 @@ sub run_testcase_need_master_restart($)
|
|||
join(" ", @{$master->[0]->{'start_opts'}}) . "'" );
|
||||
}
|
||||
elsif( ! $master->[0]->{'pid'} )
|
||||
{
|
||||
if ( $opt_extern )
|
||||
{
|
||||
$do_restart= 0;
|
||||
mtr_verbose("No restart: using extern master");
|
||||
}
|
||||
else
|
||||
{
|
||||
$do_restart= 1;
|
||||
mtr_verbose("Restart master: master is not started");
|
||||
}
|
||||
|
||||
}
|
||||
return $do_restart;
|
||||
}
|
||||
|
||||
|
|
@ -4274,11 +4260,6 @@ sub run_mysqltest ($) {
|
|||
mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir);
|
||||
}
|
||||
|
||||
if ( $opt_big_test )
|
||||
{
|
||||
mtr_add_arg($args, "--big-test");
|
||||
}
|
||||
|
||||
if ( $opt_compress )
|
||||
{
|
||||
mtr_add_arg($args, "--compress");
|
||||
|
|
@ -4667,9 +4648,8 @@ Options to control what test suites or cases to run
|
|||
skip-rpl Skip the replication test cases.
|
||||
skip-im Don't start IM, and skip the IM test cases
|
||||
skip-test=PREFIX Skip test cases which name are prefixed with PREFIX
|
||||
big-test Pass "--big-test" to mysqltest which will set the
|
||||
environment variable BIG_TEST, which can be checked
|
||||
from test cases.
|
||||
big-test Set the environment variable BIG_TEST, which can be
|
||||
checked from test cases.
|
||||
|
||||
Options that specify ports
|
||||
|
||||
|
|
@ -4692,7 +4672,8 @@ Options to run test on running server
|
|||
extern Use running server for tests FIXME DANGEROUS
|
||||
ndb-connectstring=STR Use running cluster, and connect using STR
|
||||
ndb-connectstring-slave=STR Use running slave cluster, and connect using STR
|
||||
user=USER User for connect to server
|
||||
user=USER User for connection to extern server
|
||||
socket=PATH Socket for connection to extern server
|
||||
|
||||
Options for debugging the product
|
||||
|
||||
|
|
@ -4742,22 +4723,14 @@ Misc options
|
|||
|
||||
testcase-timeout=MINUTES Max test case run time (default $default_testcase_timeout)
|
||||
suite-timeout=MINUTES Max test suite run time (default $default_suite_timeout)
|
||||
warnings | log-warnings Pass --log-warnings to mysqld
|
||||
|
||||
sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time
|
||||
|
||||
Deprecated options
|
||||
with-openssl Deprecated option for ssl
|
||||
|
||||
|
||||
Options not yet described, or that I want to look into more
|
||||
local
|
||||
netware
|
||||
sleep=SECONDS
|
||||
socket=PATH
|
||||
user-test=s
|
||||
wait-timeout=SECONDS
|
||||
warnings
|
||||
log-warnings
|
||||
|
||||
HERE
|
||||
mtr_exit(1);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue