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

[test suite] establish new test.log file in --list mode

Browse Source
This commit is contained in:
Michael Rash 2014-03-06 23:52:56 -05:00
parent f476570b2a
commit f3a02b5d2d
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
test/test-fwknop.pl
View File

@ -652,7 +652,9 @@ if ($saved_last_results) {
"to: ${output_dir}.last/\n\n"); "to: ${output_dir}.last/\n\n");
} }
copy $init_file, "$output_dir/init" if -e $init_file; unless ($list_mode) {
copy $init_file, "$output_dir/init" if -e $init_file;
}
if ($enable_valgrind) { if ($enable_valgrind) {
if ($previous_valgrind_coverage_dir) { if ($previous_valgrind_coverage_dir) {
@ -723,8 +725,10 @@ if ($enable_valgrind) {
&logr("\n"); &logr("\n");
&remove_permissions_warnings() unless $include_permissions_warnings; unless ($list_mode) {
&restore_gpg_dirs(); &remove_permissions_warnings() unless $include_permissions_warnings;
&restore_gpg_dirs();
}
my $total_elapsed_seconds = time() - $start_time; my $total_elapsed_seconds = time() - $start_time;
my $total_elapsed_minutes = sprintf "%.2f", ($total_elapsed_seconds / 60); my $total_elapsed_minutes = sprintf "%.2f", ($total_elapsed_seconds / 60);
@ -749,7 +753,9 @@ if ($fuzzing_ctr > 0) {
} }
&logr("[+] $passed/$failed/$executed test buckets passed/failed/executed\n\n"); &logr("[+] $passed/$failed/$executed test buckets passed/failed/executed\n\n");
copy $logfile, "$output_dir/$logfile" or die $!; unless ($list_mode) {
copy $logfile, "$output_dir/$logfile" or die $!;
}
if ($pinentry_fail) { if ($pinentry_fail) {
if ($killall_path) { if ($killall_path) {
@ -5602,6 +5608,7 @@ sub init() {
} }
unlink $init_file if -e $init_file; unlink $init_file if -e $init_file;
unlink $logfile if -e $logfile;
if ($test_include) { if ($test_include) {
for my $re (split /\s*,\s*/, $test_include) { for my $re (split /\s*,\s*/, $test_include) {
@ -5783,40 +5790,41 @@ sub init() {
} }
sub preserve_previous_test_run_results() { sub preserve_previous_test_run_results() {
unless ($list_mode) {
if (-d $output_dir) {
if (-d "${output_dir}.last") {
rmtree "${output_dir}.last"
or die "[*] rmtree ${output_dir}.last $!";
}
move $output_dir, "${output_dir}.last" or die $!;
if (-e "$output_dir/init") {
copy "$output_dir/init", "${output_dir}.last/init";
}
if (-e $logfile) {
copy $logfile, "${output_dir}.last/$logfile" or die $!;
}
$saved_last_results = 1;
} else {
mkdir $output_dir or die "[*] Could not mkdir $output_dir: $!";
}
if (-d $run_dir) { return if $list_mode;
rmtree $run_dir or die $!;
}
mkdir $run_dir or die "[*] Could not mkdir $run_dir: $!";
for my $dir ($output_dir, $run_dir) { if (-d $output_dir) {
next if -d $dir; if (-d "${output_dir}.last") {
mkdir $dir or die "[*] Could not mkdir $dir: $!"; rmtree "${output_dir}.last"
or die "[*] rmtree ${output_dir}.last $!";
} }
move $output_dir, "${output_dir}.last" or die $!;
if (-e "$output_dir/init") {
copy "$output_dir/init", "${output_dir}.last/init";
}
if (-e $logfile) {
copy $logfile, "${output_dir}.last/$logfile" or die $!;
}
$saved_last_results = 1;
} else {
mkdir $output_dir or die "[*] Could not mkdir $output_dir: $!";
}
for my $file (glob("$output_dir/*.test"), "$output_dir/init", if (-d $run_dir) {
$tmp_rc_file, $tmp_pkt_file, $tmp_args_file, rmtree $run_dir or die $!;
$logfile, $key_gen_file) { }
next unless -e $file; mkdir $run_dir or die "[*] Could not mkdir $run_dir: $!";
unlink $file or die "[*] Could not unlink($file)";
} for my $dir ($output_dir, $run_dir) {
next if -d $dir;
mkdir $dir or die "[*] Could not mkdir $dir: $!";
}
for my $file (glob("$output_dir/*.test"), "$output_dir/init",
$tmp_rc_file, $tmp_pkt_file, $tmp_args_file,
$logfile, $key_gen_file) {
next unless -e $file;
unlink $file or die "[*] Could not unlink($file)";
} }
return; return;
} }
@ -6445,7 +6453,8 @@ sub write_test_file() {
sub logr() { sub logr() {
my $msg = shift; my $msg = shift;
print STDOUT $msg; print STDOUT $msg;
open F, ">> $logfile" or die $!; open F, ">> $logfile"
or die "[*] Could not append msg '$msg' to $logfile: $!";
print F $msg; print F $msg;
close F; close F;
return; return;