X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2Fengine.py;h=67912857e479792a2420133bb71ceb6df2ad7668;hb=c1090722157b531261a7cf0257f2dccb744bd93d;hp=0d27b775660d8f73a06f2537573dfcf4f29c4a30;hpb=895aecbfb8bc5e488db5098cd3fadf3f59d82881;p=kconfig-hardened-check.git

diff --git a/kconfig_hardened_check/engine.py b/kconfig_hardened_check/engine.py
index 0d27b77..6791285 100644
--- a/kconfig_hardened_check/engine.py
+++ b/kconfig_hardened_check/engine.py
@@ -45,10 +45,6 @@ class OptCheck:
         self.state = None
         self.result = None
 
-    @property
-    def type(self):
-        return None
-
     def check(self):
         # handle the 'is present' check
         if self.expected == 'is present':
@@ -62,7 +58,7 @@ class OptCheck:
         if self.expected == 'is not off':
             if self.state == 'off':
                 self.result = 'FAIL: is off'
-            if self.state == '0':
+            elif self.state == '0':
                 self.result = 'FAIL: is off, "0"'
             elif self.state is None:
                 self.result = 'FAIL: is off, not found'
@@ -254,6 +250,8 @@ def populate_simple_opt_with_data(opt, data, data_type):
            f'invalid opt type "{opt.type}"'
     assert(data_type in SIMPLE_OPTION_TYPES), \
            f'invalid data type "{data_type}"'
+    assert(data), \
+           'empty data'
 
     if data_type != opt.type:
         return
@@ -285,6 +283,14 @@ def populate_with_data(checklist, data, data_type):
         populate_opt_with_data(opt, data, data_type)
 
 
+def override_expected_value(checklist, name, new_val):
+    for opt in checklist:
+        if opt.name == name:
+            assert(opt.type in ('kconfig', 'cmdline')), \
+                   f'overriding an expected value for "{opt.type}" checks is not supported yet'
+            opt.expected = new_val
+
+
 def perform_checks(checklist):
     for opt in checklist:
         opt.check()