DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

remove CMD timestamps for --diff mode

Browse Source
This commit is contained in:
Michael Rash 2011-11-10 22:33:00 -05:00
parent 9e19b8bc26
commit 9ebd55f522
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/test-fwknop.pl
View File

@ -916,7 +916,8 @@ sub diff_test_results() {
&build_results_hash(\%current_tests, $output_dir); &build_results_hash(\%current_tests, $output_dir);
&build_results_hash(\%previous_tests, "${output_dir}.last"); &build_results_hash(\%previous_tests, "${output_dir}.last");
for my $test_msg (keys %current_tests) { for my $test_msg (sort {$current_tests{$a}{'num'} <=> $current_tests{$b}{'num'}}
keys %current_tests) {
my $current_result = $current_tests{$test_msg}{'pass_fail'}; my $current_result = $current_tests{$test_msg}{'pass_fail'};
my $current_num = $current_tests{$test_msg}{'num'}; my $current_num = $current_tests{$test_msg}{'num'};
if (defined $previous_tests{$test_msg}) { if (defined $previous_tests{$test_msg}) {
@ -938,15 +939,19 @@ sub diff_test_results() {
sub diff_results() { sub diff_results() {
my ($previous_num, $current_num) = @_; my ($previous_num, $current_num) = @_;
### first edit out any valgrind "==354==" prefixes ### edit out any valgrind "==354==" prefixes
my $search_re = qw/^==\d+==\s/; my $valgrind_search_re = qr/^==\d+==\s/;
### remove CMD timestamps
my $cmd_search_re = qr/^\S+\s.*?\s\d{4}\sCMD\:/;
for my $file ("${output_dir}.last/${previous_num}.test", for my $file ("${output_dir}.last/${previous_num}.test",
"${output_dir}.last/${previous_num}_fwknopd.test", "${output_dir}.last/${previous_num}_fwknopd.test",
"${output_dir}/${current_num}.test", "${output_dir}/${current_num}.test",
"${output_dir}/${current_num}_fwknopd.test", "${output_dir}/${current_num}_fwknopd.test",
) { ) {
system qq{perl -p -i -e 's|$search_re||' $file} if -e $file; system qq{perl -p -i -e 's|$valgrind_search_re||' $file} if -e $file;
system qq{perl -p -i -e 's|$cmd_search_re|CMD:|' $file} if -e $file;
} }
if (-e "${output_dir}.last/${previous_num}.test" if (-e "${output_dir}.last/${previous_num}.test"