Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
d4a9ed4b
Commit
d4a9ed4b
authored
Apr 24, 2008
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace all - with - in $opt name
parent
d21e7383
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
10 deletions
+26
-10
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+1
-1
mysql-test/lib/mtr_report.pm
mysql-test/lib/mtr_report.pm
+25
-9
No files found.
mysql-test/lib/mtr_cases.pm
View file @
d4a9ed4b
...
@@ -46,7 +46,7 @@ sub collect_option {
...
@@ -46,7 +46,7 @@ sub collect_option {
my
(
$opt
,
$value
)
=
@_
;
my
(
$opt
,
$value
)
=
@_
;
# Convert - to _ in option name
# Convert - to _ in option name
$opt
=~
s/-/_/
;
$opt
=~
s/-/_/
g
;
no
strict
'
refs
';
no
strict
'
refs
';
$
{
$opt
}
=
$value
;
$
{
$opt
}
=
$value
;
}
}
...
...
mysql-test/lib/mtr_report.pm
View file @
d4a9ed4b
...
@@ -26,8 +26,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line
...
@@ -26,8 +26,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line
mtr_print_header mtr_report mtr_report_stats
mtr_print_header mtr_report mtr_report_stats
mtr_warning mtr_error mtr_debug mtr_verbose
mtr_warning mtr_error mtr_debug mtr_verbose
mtr_verbose_restart mtr_report_test_passed
mtr_verbose_restart mtr_report_test_passed
mtr_report_test_failed mtr_report_test_skipped
mtr_report_test_failed mtr_report_test_skipped)
;
mtr_report_stats)
;
use
mtr_match
;
use
mtr_match
;
require
"
mtr_io.pl
";
require
"
mtr_io.pl
";
...
@@ -35,12 +34,13 @@ require "mtr_io.pl";
...
@@ -35,12 +34,13 @@ require "mtr_io.pl";
my
$tot_real_time
=
0
;
my
$tot_real_time
=
0
;
our
$timestamp
=
0
;
our
$timestamp
=
0
;
our
$timediff
=
1
;
sub
report_option
{
sub
report_option
{
my
(
$opt
,
$value
)
=
@_
;
my
(
$opt
,
$value
)
=
@_
;
# Convert - to _ in option name
# Convert - to _ in option name
$opt
=~
s/-/_/
;
$opt
=~
s/-/_/
g
;
no
strict
'
refs
';
no
strict
'
refs
';
$
{
$opt
}
=
$value
;
$
{
$opt
}
=
$value
;
}
}
...
@@ -228,20 +228,20 @@ sub mtr_report_stats ($) {
...
@@ -228,20 +228,20 @@ sub mtr_report_stats ($) {
# Print a list of check_testcases that failed(if any)
# Print a list of check_testcases that failed(if any)
if
(
$::opt_check_testcases
)
if
(
$::opt_check_testcases
)
{
{
my
@check_testcases
=
()
;
my
%
check_testcases
;
foreach
my
$tinfo
(
@$tests
)
foreach
my
$tinfo
(
@$tests
)
{
{
if
(
defined
$tinfo
->
{'
check_testcase_failed
'}
)
if
(
defined
$tinfo
->
{'
check_testcase_failed
'}
)
{
{
push
(
@check_testcases
,
$tinfo
->
{'
name
'})
;
$check_testcases
{
$tinfo
->
{'
name
'}}
=
1
;
}
}
}
}
if
(
@
check_testcases
)
if
(
keys
%
check_testcases
)
{
{
print
"
Check of testcase failed for:
";
print
"
Check of testcase failed for:
";
print
join
("
",
@
check_testcases
);
print
join
("
",
keys
%
check_testcases
);
print
"
\n\n
";
print
"
\n\n
";
}
}
}
}
...
@@ -330,13 +330,29 @@ sub mtr_print_header () {
...
@@ -330,13 +330,29 @@ sub mtr_print_header () {
use
Time::
localtime
;
use
Time::
localtime
;
use
Time::
HiRes
qw(gettimeofday)
;
my
$t0
=
gettimeofday
();
sub
_timestamp
{
sub
_timestamp
{
return
""
unless
$timestamp
;
return
""
unless
$timestamp
;
my
$diff
;
if
(
$timediff
){
my
$t1
=
gettimeofday
();
my
$elapsed
=
$t1
-
$t0
;
$diff
=
sprintf
("
+%02.3f
",
$elapsed
);
# Save current time for next lap
$t0
=
$t1
;
}
my
$tm
=
localtime
();
my
$tm
=
localtime
();
return
sprintf
("
%02d%02d%02d %2d:%02d:%02d
",
return
sprintf
("
%02d%02d%02d %2d:%02d:%02d
%s
",
$tm
->
year
%
100
,
$tm
->
mon
+
1
,
$tm
->
mday
,
$tm
->
year
%
100
,
$tm
->
mon
+
1
,
$tm
->
mday
,
$tm
->
hour
,
$tm
->
min
,
$tm
->
sec
);
$tm
->
hour
,
$tm
->
min
,
$tm
->
sec
,
$diff
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment