ktest: Fixing indentation to match expected pattern
This is a followup to "ktest: Adding editor hints to improve consistency" to actually adjust the existing indentation to match the, now, expected pattern (first column 4 spaces, 2nd tab, 3rd tab + 4 spaces, etc). This should, at least help, keep things consistent going forward now. Signed-off-by: John 'Warthog9' Hawley (VMware) <warthog9@eaglescrag.net> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
John 'Warthog9' Hawley (VMware)
Steven Rostedt (VMware)
parent
becdd17b5a
commit
12d4cddda2
@ -760,7 +760,7 @@ sub process_variables {
|
||||
# remove the space added in the beginning
|
||||
$retval =~ s/ //;
|
||||
|
||||
return "$retval"
|
||||
return "$retval";
|
||||
}
|
||||
|
||||
sub set_value {
|
||||
@ -1095,7 +1095,7 @@ sub __read_config {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( ! -r $file ) {
|
||||
die "$name: $.: Can't read file $file\n$_";
|
||||
}
|
||||
@ -1186,13 +1186,13 @@ sub __read_config {
|
||||
}
|
||||
|
||||
sub get_test_case {
|
||||
print "What test case would you like to run?\n";
|
||||
print " (build, install or boot)\n";
|
||||
print " Other tests are available but require editing ktest.conf\n";
|
||||
print " (see tools/testing/ktest/sample.conf)\n";
|
||||
my $ans = <STDIN>;
|
||||
chomp $ans;
|
||||
$default{"TEST_TYPE"} = $ans;
|
||||
print "What test case would you like to run?\n";
|
||||
print " (build, install or boot)\n";
|
||||
print " Other tests are available but require editing ktest.conf\n";
|
||||
print " (see tools/testing/ktest/sample.conf)\n";
|
||||
my $ans = <STDIN>;
|
||||
chomp $ans;
|
||||
$default{"TEST_TYPE"} = $ans;
|
||||
}
|
||||
|
||||
sub read_config {
|
||||
@ -1519,13 +1519,13 @@ sub dodie {
|
||||
close O;
|
||||
close L;
|
||||
}
|
||||
send_email("KTEST: critical failure for test $i [$name]",
|
||||
"Your test started at $script_start_time has failed with:\n@_\n", $log_file);
|
||||
send_email("KTEST: critical failure for test $i [$name]",
|
||||
"Your test started at $script_start_time has failed with:\n@_\n", $log_file);
|
||||
}
|
||||
|
||||
if ($monitor_cnt) {
|
||||
# restore terminal settings
|
||||
system("stty $stty_orig");
|
||||
# restore terminal settings
|
||||
system("stty $stty_orig");
|
||||
}
|
||||
|
||||
if (defined($post_test)) {
|
||||
@ -1709,81 +1709,81 @@ sub wait_for_monitor {
|
||||
}
|
||||
|
||||
sub save_logs {
|
||||
my ($result, $basedir) = @_;
|
||||
my @t = localtime;
|
||||
my $date = sprintf "%04d%02d%02d%02d%02d%02d",
|
||||
1900+$t[5],$t[4],$t[3],$t[2],$t[1],$t[0];
|
||||
my ($result, $basedir) = @_;
|
||||
my @t = localtime;
|
||||
my $date = sprintf "%04d%02d%02d%02d%02d%02d",
|
||||
1900+$t[5],$t[4],$t[3],$t[2],$t[1],$t[0];
|
||||
|
||||
my $type = $build_type;
|
||||
if ($type =~ /useconfig/) {
|
||||
$type = "useconfig";
|
||||
my $type = $build_type;
|
||||
if ($type =~ /useconfig/) {
|
||||
$type = "useconfig";
|
||||
}
|
||||
|
||||
my $dir = "$machine-$test_type-$type-$result-$date";
|
||||
|
||||
$dir = "$basedir/$dir";
|
||||
|
||||
if (!-d $dir) {
|
||||
mkpath($dir) or
|
||||
dodie "can't create $dir";
|
||||
}
|
||||
|
||||
my %files = (
|
||||
"config" => $output_config,
|
||||
"buildlog" => $buildlog,
|
||||
"dmesg" => $dmesg,
|
||||
"testlog" => $testlog,
|
||||
);
|
||||
|
||||
while (my ($name, $source) = each(%files)) {
|
||||
if (-f "$source") {
|
||||
cp "$source", "$dir/$name" or
|
||||
dodie "failed to copy $source";
|
||||
}
|
||||
}
|
||||
|
||||
my $dir = "$machine-$test_type-$type-$result-$date";
|
||||
|
||||
$dir = "$basedir/$dir";
|
||||
|
||||
if (!-d $dir) {
|
||||
mkpath($dir) or
|
||||
dodie "can't create $dir";
|
||||
}
|
||||
|
||||
my %files = (
|
||||
"config" => $output_config,
|
||||
"buildlog" => $buildlog,
|
||||
"dmesg" => $dmesg,
|
||||
"testlog" => $testlog,
|
||||
);
|
||||
|
||||
while (my ($name, $source) = each(%files)) {
|
||||
if (-f "$source") {
|
||||
cp "$source", "$dir/$name" or
|
||||
dodie "failed to copy $source";
|
||||
}
|
||||
}
|
||||
|
||||
doprint "*** Saved info to $dir ***\n";
|
||||
doprint "*** Saved info to $dir ***\n";
|
||||
}
|
||||
|
||||
sub fail {
|
||||
|
||||
if ($die_on_failure) {
|
||||
dodie @_;
|
||||
}
|
||||
if ($die_on_failure) {
|
||||
dodie @_;
|
||||
}
|
||||
|
||||
doprint "FAILED\n";
|
||||
doprint "FAILED\n";
|
||||
|
||||
my $i = $iteration;
|
||||
my $i = $iteration;
|
||||
|
||||
# no need to reboot for just building.
|
||||
if (!do_not_reboot) {
|
||||
doprint "REBOOTING\n";
|
||||
reboot_to_good $sleep_time;
|
||||
}
|
||||
# no need to reboot for just building.
|
||||
if (!do_not_reboot) {
|
||||
doprint "REBOOTING\n";
|
||||
reboot_to_good $sleep_time;
|
||||
}
|
||||
|
||||
my $name = "";
|
||||
my $name = "";
|
||||
|
||||
if (defined($test_name)) {
|
||||
$name = " ($test_name)";
|
||||
}
|
||||
if (defined($test_name)) {
|
||||
$name = " ($test_name)";
|
||||
}
|
||||
|
||||
print_times;
|
||||
print_times;
|
||||
|
||||
doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
|
||||
doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
|
||||
doprint "KTEST RESULT: TEST $i$name Failed: ", @_, "\n";
|
||||
doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
|
||||
doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
|
||||
doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
|
||||
doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
|
||||
doprint "KTEST RESULT: TEST $i$name Failed: ", @_, "\n";
|
||||
doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
|
||||
doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
|
||||
|
||||
if (defined($store_failures)) {
|
||||
save_logs "fail", $store_failures;
|
||||
}
|
||||
if (defined($store_failures)) {
|
||||
save_logs "fail", $store_failures;
|
||||
}
|
||||
|
||||
if (defined($post_test)) {
|
||||
run_command $post_test;
|
||||
}
|
||||
if (defined($post_test)) {
|
||||
run_command $post_test;
|
||||
}
|
||||
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
sub run_command {
|
||||
@ -1969,9 +1969,9 @@ sub get_grub_index {
|
||||
$target = '^menuentry.*' . $grub_menu_qt;
|
||||
$skip = '^menuentry\s|^submenu\s';
|
||||
} elsif ($reboot_type eq "grub2bls") {
|
||||
$command = $grub_bls_get;
|
||||
$target = '^title=.*' . $grub_menu_qt;
|
||||
$skip = '^title=';
|
||||
$command = $grub_bls_get;
|
||||
$target = '^title=.*' . $grub_menu_qt;
|
||||
$skip = '^title=';
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
@ -2394,7 +2394,7 @@ sub check_buildlog {
|
||||
while (<IN>) {
|
||||
if (/$check_build_re/) {
|
||||
my $warning = process_warning_line $_;
|
||||
|
||||
|
||||
$warnings_list{$warning} = 1;
|
||||
}
|
||||
}
|
||||
@ -2659,7 +2659,7 @@ sub success {
|
||||
doprint "*******************************************\n";
|
||||
|
||||
if (defined($store_successes)) {
|
||||
save_logs "success", $store_successes;
|
||||
save_logs "success", $store_successes;
|
||||
}
|
||||
|
||||
if ($i != $opt{"NUM_TESTS"} && !do_not_reboot) {
|
||||
@ -3246,13 +3246,13 @@ sub run_config_bisect {
|
||||
|
||||
$ret = run_config_bisect_test $config_bisect_type;
|
||||
if ($ret) {
|
||||
doprint "NEW GOOD CONFIG ($pass)\n";
|
||||
doprint "NEW GOOD CONFIG ($pass)\n";
|
||||
system("cp $output_config $tmpdir/good_config.tmp.$pass");
|
||||
$pass++;
|
||||
# Return 3 for good config
|
||||
return 3;
|
||||
} else {
|
||||
doprint "NEW BAD CONFIG ($pass)\n";
|
||||
doprint "NEW BAD CONFIG ($pass)\n";
|
||||
system("cp $output_config $tmpdir/bad_config.tmp.$pass");
|
||||
$pass++;
|
||||
# Return 4 for bad config
|
||||
@ -3371,7 +3371,7 @@ sub config_bisect {
|
||||
} while ($ret == 3 || $ret == 4);
|
||||
|
||||
if ($ret == 2) {
|
||||
config_bisect_end "$good_config.tmp", "$bad_config.tmp";
|
||||
config_bisect_end "$good_config.tmp", "$bad_config.tmp";
|
||||
}
|
||||
|
||||
return $ret if ($ret < 0);
|
||||
@ -3551,7 +3551,6 @@ sub read_kconfig {
|
||||
my $cont = 0;
|
||||
my $line;
|
||||
|
||||
|
||||
if (! -f $kconfig) {
|
||||
doprint "file $kconfig does not exist, skipping\n";
|
||||
return;
|
||||
@ -3660,7 +3659,7 @@ sub read_depends {
|
||||
|
||||
if (! -f $kconfig && $arch =~ /\d$/) {
|
||||
my $orig = $arch;
|
||||
# some subarchs have numbers, truncate them
|
||||
# some subarchs have numbers, truncate them
|
||||
$arch =~ s/\d*$//;
|
||||
$kconfig = "$builddir/arch/$arch/Kconfig";
|
||||
if (! -f $kconfig) {
|
||||
@ -3855,7 +3854,7 @@ sub make_min_config {
|
||||
foreach my $config (@config_keys) {
|
||||
my $kconfig = chomp_config $config;
|
||||
if (!defined $depcount{$kconfig}) {
|
||||
$depcount{$kconfig} = 0;
|
||||
$depcount{$kconfig} = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3957,13 +3956,13 @@ sub make_min_config {
|
||||
my $failed = 0;
|
||||
build "oldconfig" or $failed = 1;
|
||||
if (!$failed) {
|
||||
start_monitor_and_install or $failed = 1;
|
||||
start_monitor_and_install or $failed = 1;
|
||||
|
||||
if ($type eq "test" && !$failed) {
|
||||
do_run_test or $failed = 1;
|
||||
}
|
||||
if ($type eq "test" && !$failed) {
|
||||
do_run_test or $failed = 1;
|
||||
}
|
||||
|
||||
end_monitor;
|
||||
end_monitor;
|
||||
}
|
||||
|
||||
$in_bisect = 0;
|
||||
@ -4277,8 +4276,8 @@ sub send_email {
|
||||
sub cancel_test {
|
||||
if ($email_when_canceled) {
|
||||
my $name = get_test_name;
|
||||
send_email("KTEST: Your [$name] test was cancelled",
|
||||
"Your test started at $script_start_time was cancelled: sig int");
|
||||
send_email("KTEST: Your [$name] test was cancelled",
|
||||
"Your test started at $script_start_time was cancelled: sig int");
|
||||
}
|
||||
die "\nCaught Sig Int, test interrupted: $!\n"
|
||||
}
|
||||
@ -4326,15 +4325,15 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
|
||||
|
||||
# The first test may override the PRE_KTEST option
|
||||
if ($i == 1) {
|
||||
if (defined($pre_ktest)) {
|
||||
doprint "\n";
|
||||
run_command $pre_ktest;
|
||||
}
|
||||
if ($email_when_started) {
|
||||
if (defined($pre_ktest)) {
|
||||
doprint "\n";
|
||||
run_command $pre_ktest;
|
||||
}
|
||||
if ($email_when_started) {
|
||||
my $name = get_test_name;
|
||||
send_email("KTEST: Your [$name] test was started",
|
||||
"Your test was started on $script_start_time");
|
||||
}
|
||||
send_email("KTEST: Your [$name] test was started",
|
||||
"Your test was started on $script_start_time");
|
||||
}
|
||||
}
|
||||
|
||||
# Any test can override the POST_KTEST option
|
||||
@ -4506,12 +4505,11 @@ if ($opt{"POWEROFF_ON_SUCCESS"}) {
|
||||
run_command $switch_to_good;
|
||||
}
|
||||
|
||||
|
||||
doprint "\n $successes of $opt{NUM_TESTS} tests were successful\n\n";
|
||||
|
||||
if ($email_when_finished) {
|
||||
send_email("KTEST: Your test has finished!",
|
||||
"$successes of $opt{NUM_TESTS} tests started at $script_start_time were successful!");
|
||||
"$successes of $opt{NUM_TESTS} tests started at $script_start_time were successful!");
|
||||
}
|
||||
|
||||
if (defined($opt{"LOG_FILE"})) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user