Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set

to a value wich is not our default
parent 9a5b4a11
...@@ -263,9 +263,6 @@ sub collect_one_test_case($$$$$$$) { ...@@ -263,9 +263,6 @@ sub collect_one_test_case($$$$$$$) {
return; return;
} }
# ----------------------------------------------------------------------
# Skip some tests but include in list, just mark them to skip
# ----------------------------------------------------------------------
my $tinfo= {}; my $tinfo= {};
$tinfo->{'name'}= $tname; $tinfo->{'name'}= $tname;
...@@ -273,6 +270,10 @@ sub collect_one_test_case($$$$$$$) { ...@@ -273,6 +270,10 @@ sub collect_one_test_case($$$$$$$) {
$tinfo->{'component_id'} = $component_id; $tinfo->{'component_id'} = $component_id;
push(@$cases, $tinfo); push(@$cases, $tinfo);
# ----------------------------------------------------------------------
# Skip some tests but include in list, just mark them to skip
# ----------------------------------------------------------------------
if ( $::opt_skip_test and defined mtr_match_prefix($tname,$::opt_skip_test) ) if ( $::opt_skip_test and defined mtr_match_prefix($tname,$::opt_skip_test) )
{ {
$tinfo->{'skip'}= 1; $tinfo->{'skip'}= 1;
...@@ -356,8 +357,9 @@ sub collect_one_test_case($$$$$$$) { ...@@ -356,8 +357,9 @@ sub collect_one_test_case($$$$$$$) {
$value= mtr_match_prefix($opt, "--default-time-zone="); $value= mtr_match_prefix($opt, "--default-time-zone=");
if ( defined $value ) if ( defined $value )
{ {
$tinfo->{'timezone'}= ""; # Set timezone for this test case to something different
# Fallthrough, add this option $tinfo->{'timezone'}= "GMT-8";
# Fallthrough, add the --default-time-zone option
} }
# The --restart option forces a restart even if no special # The --restart option forces a restart even if no special
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment