From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 12/17][RFC] ktest: Consolidate TEST_TYPE and DEFAULT code
Date: Mon, 17 Oct 2011 12:05:07 -0400 [thread overview]
Message-ID: <20111017165952.559137810@goodmis.org> (raw)
In-Reply-To: 20111017160455.498567257@goodmis.org
[-- Attachment #1: Type: text/plain, Size: 2497 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
The code that handles parsing the TEST_TYPE and DEFAULT code share
a lot of common functionality. Combine the two and add a if statement
that does what is different between them.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
tools/testing/ktest/ktest.pl | 61 ++++++++++++++---------------------------
1 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 62de47d..b4f32e7 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -436,20 +436,29 @@ sub __read_config {
# ignore blank lines and comments
next if (/^\s*$/ || /\s*\#/);
- if (/^\s*TEST_START(.*)/) {
+ if (/^\s*(TEST_START|DEFAULTS)\b(.*)/) {
- $rest = $1;
+ my $type = $1;
+ $rest = $2;
- if ($num_tests_set) {
- die "$name: $.: Can not specify both NUM_TESTS and TEST_START\n";
- }
+ my $old_test_num;
+ my $old_repeat;
+
+ if ($type eq "TEST_START") {
- my $old_test_num = $test_num;
- my $old_repeat = $repeat;
+ if ($num_tests_set) {
+ die "$name: $.: Can not specify both NUM_TESTS and TEST_START\n";
+ }
- $test_num += $repeat;
- $default = 0;
- $repeat = 1;
+ $old_test_num = $test_num;
+ $old_repeat = $repeat;
+
+ $test_num += $repeat;
+ $default = 0;
+ $repeat = 1;
+ } else {
+ $default = 1;
+ }
if ($rest =~ /\s+SKIP\b(.*)/) {
$rest = $1;
@@ -478,42 +487,14 @@ sub __read_config {
}
if ($rest !~ /^\s*$/) {
- die "$name: $.: Gargbage found after TEST_START\n$_";
+ die "$name: $.: Gargbage found after $type\n$_";
}
- if ($skip) {
+ if ($skip && $type eq "TEST_START") {
$test_num = $old_test_num;
$repeat = $old_repeat;
}
- } elsif (/^\s*DEFAULTS(.*)$/) {
- $default = 1;
-
- $rest = $1;
-
- if ($rest =~ /\s+SKIP(.*)/) {
- $rest = $1;
- $skip = 1;
- } else {
- $skip = 0;
- }
-
- if ($rest =~ /\sIF\s+(.*)/) {
- $if = 1;
- if (process_if($name, $1)) {
- $if_set = 1;
- } else {
- $skip = 1;
- }
- $rest = "";
- } else {
- $if = 0;
- }
-
- if ($rest !~ /^\s*$/) {
- die "$name: $.: Gargbage found after DEFAULTS\n$_";
- }
-
} elsif (/^\s*ELSE\b(.*)$/) {
if (!$if) {
die "$name: $.: ELSE found with out matching IF section\n$_";
--
1.7.6.3
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2011-10-17 16:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-17 16:04 [PATCH 00/17][RFC] ktest updates for v3.2 Steven Rostedt
2011-10-17 16:04 ` [PATCH 01/17][RFC] ktest: Add TEST_TYPE install option Steven Rostedt
2011-10-17 16:04 ` [PATCH 02/17][RFC] ktest: Create outputdir if it does not exist Steven Rostedt
2011-10-17 16:04 ` [PATCH 03/17][RFC] ktest: Only need to save .config when doing mrproper Steven Rostedt
2011-10-17 16:04 ` [PATCH 04/17][RFC] ktest: Include monitor in reboot code Steven Rostedt
2011-10-17 16:05 ` [PATCH 05/17][RFC] ktest: Fail when grub menu not found Steven Rostedt
2011-10-17 16:05 ` [PATCH 06/17][RFC] ktest: Add NO_INSTALL option to not install for a test Steven Rostedt
2011-10-17 16:05 ` [PATCH 07/17][RFC] ktest: Add option REBOOT_SUCCESS_LINE to stop waiting after a reboot Steven Rostedt
2011-10-17 16:05 ` [PATCH 08/17][RFC] ktest: Do not reboot on config or build issues Steven Rostedt
2011-10-17 16:05 ` [PATCH 09/17][RFC] ktest: Add IF and ELSE to config sections Steven Rostedt
2011-10-17 16:05 ` [PATCH 10/17][RFC] ktest: Let IF keyword take comparisons Steven Rostedt
2011-10-17 16:05 ` [PATCH 11/17][RFC] ktest: Add INCLUDE keyword to include other config files Steven Rostedt
2011-10-17 16:05 ` Steven Rostedt [this message]
2011-10-17 16:05 ` [PATCH 13/17][RFC] ktest: Add OVERRIDE keyword to DEFAULTS section Steven Rostedt
2011-10-17 16:05 ` [PATCH 14/17][RFC] ktest: Add DEFINED keyword for IF statements Steven Rostedt
2011-10-17 16:05 ` [PATCH 15/17][RFC] ktest: Sort make_min_config configs by dependecies Steven Rostedt
2011-10-17 16:05 ` [PATCH 16/17][RFC] ktest: Fix parsing of config section lines Steven Rostedt
2011-10-17 16:05 ` [PATCH 17/17][RFC] ktest: Add processing of complex conditionals Steven Rostedt
2011-10-20 14:31 ` [PATCH 00/17][RFC] ktest updates for v3.2 Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111017165952.559137810@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox