Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1688571

[PATCH 2/8] ktest: Set buildonly=1 for CONFIG_BISECT_TYPE=build

Show all headers | View raw

Rather than adding a third copy of the same logic, rework it to cover
all three buildonly cases at once.

In the future, please consider using the same variable to perform the
same function regardless of context...

Signed-off-by: Scott Wood <swood@redhat.com>
---
 tools/testing/ktest/ktest.pl | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index cdf6974bc462..36e1b91259cd 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -718,22 +718,14 @@ sub set_value {
 
     my $prvalue = process_variables($rvalue);
 
-    if ($buildonly && $lvalue =~ /^TEST_TYPE(\[.*\])?$/ && $prvalue ne "build") {
+    if ($lvalue =~ /^(TEST|BISECT|CONFIG_BISECT)_TYPE(\[.*\])?$/ &&
+	$prvalue !~ /^(config_|)bisect$/ &&
+	$prvalue !~ /^build$/ &&
+	$buildonly) {
+
 	# Note if a test is something other than build, then we
 	# will need other mandatory options.
 	if ($prvalue ne "install") {
-	    # for bisect, we need to check BISECT_TYPE
-	    if ($prvalue ne "bisect") {
-		$buildonly = 0;
-	    }
-	} else {
-	    # install still limits some mandatory options.
-	    $buildonly = 2;
-	}
-    }
-
-    if ($buildonly && $lvalue =~ /^BISECT_TYPE(\[.*\])?$/ && $prvalue ne "build") {
-	if ($prvalue ne "install") {
 	    $buildonly = 0;
 	} else {
 	    # install still limits some mandatory options.
-- 
2.9.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/8] ktest: Clarify config file usage Scott Wood <swood@redhat.com> - 2017-07-17 02:20 +0200
  [PATCH 2/8] ktest: Set buildonly=1 for CONFIG_BISECT_TYPE=build Scott Wood <swood@redhat.com> - 2017-07-17 02:20 +0200
  [PATCH 7/8] ktest: Add simple config-bisect frontend Scott Wood <swood@redhat.com> - 2017-07-17 02:20 +0200
  [PATCH 4/8] ktest: Separate out config bisect logic Scott Wood <swood@redhat.com> - 2017-07-17 02:20 +0200
  [PATCH 3/8] ktest: Set do_not_reboot=y for CONFIG_BISECT_TYPE=build Scott Wood <swood@redhat.com> - 2017-07-17 02:20 +0200
  [PATCH 8/8] ktest: Use config-bisect.pl in ktest.pl Scott Wood <swood@redhat.com> - 2017-07-17 02:20 +0200
  [PATCH 6/8] ktest/config-bisect: Try harder to find a new config Scott Wood <swood@redhat.com> - 2017-07-17 02:20 +0200

csiph-web