Skip to contentSkip to conversation

test/py: only check for SPL signature if SPL uses serial output

PATCH Superseded Heiko Schocher 2 participants 3 messages Feb 17, 2016

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Heiko Schocher

author
#0 lore raw

PATCH v2 1/1 test/py: only check for SPL signature if SPL uses serial output

check for U-Boot SPL signature only if SPL really has a serial output. So check if CONFIG_SPL_SERIAL_SUPPORT is active in board config.

Signed-off-by Heiko Schocher <[email protected]>

---
found this while trying test/py on the smartweb
board, which has SPL but no SPL serial output.

Changes in v2:
- add comments from Stephen Warren:
- introduce some variables to shorten text
- do not use nested if, instead use "if a and b"
- use wrapping of 72-74 chars in commit message
- add Michal Simek to Cc

 test/py/u_boot_console_base.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
test/py/u_boot_console_base.py +7 -2
index bc2bd76..79b8dc6 100644
@@ -303,8 +303,13 @@ class ConsoleBase(object):
             if not self.config.gdbserver:
                 self.p.timeout = 30000
             self.p.logfile_read = self.logstream
-            if self.config.buildconfig.get('config_spl', False) == 'y':
-                m = self.p.expect([pattern_u_boot_spl_signon] + self.bad_patterns)
+            bcfg = u_boot_console.config.buildconfig
+            config_spl = bcfg.get('config_spl', 'n') == 'y'
+            config_spl_serial_support = bcfg.get('config_spl_serial_support',
+                                                 'n') == 'y'
+            if config_spl and config_spl_serial_support:
+                m = self.p.expect([pattern_u_boot_spl_signon] +
+                                  self.bad_patterns)
                 if m != 0:
                     raise Exception('Bad pattern found on console: ' +
                                     self.bad_pattern_ids[m - 1])
Signature · 1 line
2.5.0
#1 lore raw

PATCH v2 1/1 test/py: only check for SPL signature if SPL uses serial output

Quoted 2 lines · Heiko Schocher

check for U-Boot SPL signature only if SPL really has a serial output. So check if CONFIG_SPL_SERIAL_SUPPORT is active in board config.

I suspect you didn't test this; it causes all tests to fail on all platforms...

test/py/u_boot_console_base.py

Quoted 3 lines
test/py/u_boot_console_base.py +1 -0
 
+            bcfg = u_boot_console.config.buildconfig

I think that should be self.config.buildconfig instead; there is no u_boot_console variable at this point in the code.

author
#2 lore raw

PATCH v2 1/1 test/py: only check for SPL signature if SPL uses serial output

Hello Stephen,

Am 17.02.2016 um 17:45 schrieb Stephen Warren:

Quoted 5 lines · Heiko Schocher
Quoted 2 lines

check for U-Boot SPL signature only if SPL really has a serial output. So check if CONFIG_SPL_SERIAL_SUPPORT is active in board config.

I suspect you didn't test this; it causes all tests to fail on all platforms...

Damn, yes, seems I overlooked this issue, while trying to get test/py running for the smartweb board.

Quoted 6 lines

test/py/u_boot_console_base.py

Quoted 3 lines
test/py/u_boot_console_base.py +1 -0
 
+            bcfg = u_boot_console.config.buildconfig

I think that should be self.config.buildconfig instead; there is no u_boot_console variable at this point in the code.

fixed.

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany