mtr: print a detailed warning on a uninit assignment in the [ENV] group

spider suites: #varname is a valid syntax for a variable name, don't use it for comments
This commit is contained in:
Sergei Golubchik 2013-12-25 10:13:15 +01:00
parent a1a49ec9ed
commit 1df23d6f0f
6 changed files with 151 additions and 144 deletions

View File

@ -4265,11 +4265,18 @@ sub run_testcase ($$) {
#
foreach my $option ($config->options_in_group("ENV"))
{
# Save old value to restore it before next time
$old_env{$option->name()}= $ENV{$option->name()};
my ($name, $val)= ($option->name(), $option->value());
mtr_verbose($option->name(), "=",$option->value());
$ENV{$option->name()}= $option->value();
# Save old value to restore it before next time
$old_env{$name}= $ENV{$name};
unless (defined $val) {
mtr_warning("Uninitialized value for ", $name,
", group [ENV], file ", $current_config_name);
} else {
mtr_verbose($name, "=", $val);
$ENV{$name}= $val;
}
}
}

View File

@ -146,31 +146,31 @@ CHILD3_3_CHARSET= DEFAULT CHARSET=utf8
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES

View File

@ -146,31 +146,31 @@ CHILD3_3_CHARSET= DEFAULT CHARSET=utf8
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES

View File

@ -147,31 +147,31 @@ CHILD3_3_CHARSET= DEFAULT CHARSET=utf8
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES

View File

@ -116,31 +116,31 @@ ORACLE_DATABASE= SYSTEM
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES

View File

@ -116,31 +116,31 @@ ORACLE_DATABASE= SYSTEM
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES