projects
/
kconfig-hardened-check.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
759ed4e
)
Improve the result descriptions
author
Alexander Popov
<alex.popov@linux.com>
Wed, 9 Nov 2022 14:46:38 +0000
(17:46 +0300)
committer
Alexander Popov
<alex.popov@linux.com>
Wed, 9 Nov 2022 14:46:38 +0000
(17:46 +0300)
kconfig_hardened_check/__init__.py
patch
|
blob
|
history
diff --git
a/kconfig_hardened_check/__init__.py
b/kconfig_hardened_check/__init__.py
index ec858f0c1afee9cdb77831d990351753cfe7a998..a344e17768f61b08385513f2c07be5996a660fe8 100644
(file)
--- a/
kconfig_hardened_check/__init__.py
+++ b/
kconfig_hardened_check/__init__.py
@@
-112,7
+112,7
@@
class OptCheck:
# handle the option presence check
if self.expected is None:
if self.state is None:
# handle the option presence check
if self.expected is None:
if self.state is None:
- self.result = 'FAIL: not present'
+ self.result = 'FAIL:
is
not present'
else:
self.result = 'OK: is present'
return
else:
self.result = 'OK: is present'
return
@@
-122,9
+122,9
@@
class OptCheck:
self.result = 'OK'
elif self.state is None:
if self.expected == 'is not set':
self.result = 'OK'
elif self.state is None:
if self.expected == 'is not set':
- self.result = 'OK: not found'
+ self.result = 'OK:
is
not found'
else:
else:
- self.result = 'FAIL: not found'
+ self.result = 'FAIL:
is
not found'
else:
self.result = 'FAIL: "' + self.state + '"'
else:
self.result = 'FAIL: "' + self.state + '"'
@@
-248,9
+248,9
@@
class OR(ComplexOptCheck):
# Add more info for additional checks:
if i != 0:
if opt.result == 'OK':
# Add more info for additional checks:
if i != 0:
if opt.result == 'OK':
- self.result = 'OK: {} "{}"'.format(opt.name, opt.expected)
- elif opt.result == 'OK: not found':
- self.result = 'OK: {} not found'.format(opt.name)
+ self.result = 'OK: {}
is
"{}"'.format(opt.name, opt.expected)
+ elif opt.result == 'OK:
is
not found':
+ self.result = 'OK: {}
is
not found'.format(opt.name)
elif opt.result == 'OK: is present':
self.result = 'OK: {} is present'.format(opt.name)
else:
elif opt.result == 'OK: is present':
self.result = 'OK: {} is present'.format(opt.name)
else:
@@
-277,10
+277,10
@@
class AND(ComplexOptCheck):
# This FAIL is caused by additional checks,
# and not by the main option that this AND-check is about.
# Describe the reason of the FAIL.
# This FAIL is caused by additional checks,
# and not by the main option that this AND-check is about.
# Describe the reason of the FAIL.
- if opt.result.startswith('FAIL: \"') or opt.result == 'FAIL: not found':
- self.result = 'FAIL: {} not "{}"'.format(opt.name, opt.expected)
- elif opt.result == 'FAIL: not present':
- self.result = 'FAIL: {} not present'.format(opt.name)
+ if opt.result.startswith('FAIL: \"') or opt.result == 'FAIL:
is
not found':
+ self.result = 'FAIL: {}
is
not "{}"'.format(opt.name, opt.expected)
+ elif opt.result == 'FAIL:
is
not present':
+ self.result = 'FAIL: {}
is
not present'.format(opt.name)
else:
# VersionCheck provides enough info
self.result = opt.result
else:
# VersionCheck provides enough info
self.result = opt.result