Merge branch 'labh' into 'master'

Fixes for some test in the lab

See merge request u-boot/u-boot!186

configs/colibri-imx8x_defconfig

@@ -24,7 +24,7 @@ CONFIG_REMAKE_ELF=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTDELAY=1
+CONFIG_BOOTDELAY=5
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb"

scripts/build-efi

@@ -155,7 +155,8 @@ class BuildEfi:
 
     def do_build(self, build):
         """Build U-Boot for the selected board"""
-        res = command.run_one('buildman', '-w', '-o', self.build_dir,
+        extra = ['-a', '~CONSOLE_PAGER'] if self.args.no_pager else []
+        res = command.run_one('buildman', '-w', '-o', self.build_dir, *extra,
                               '--board', build, '-I', raise_on_error=False)
         if res.return_code and res.return_code != 101:  # Allow warnings
             raise ValueError(

scripts/build-qemu

@@ -200,6 +200,8 @@ class BuildQemu:
         self.build_dir.mkdir(parents=True, exist_ok=True)
         cmd = ['buildman', '-w', '-o', str(self.build_dir), '--board',
                self.board, '-I']
+        if self.args.no_pager:
+            cmd += ['-a', '~CONSOLE_PAGER']
 
         self.execute_command(
             cmd,

scripts/build_helper.py

@@ -301,6 +301,8 @@ def add_common_args(parser):
         help='Use KVM (Kernel-based Virtual Machine) for acceleration')
     parser.add_argument('-K', '--kernel',
                         help='Kernel to run using -kernel')
+    parser.add_argument('-n', '--no-pager', action='store_true',
+                        help="Disable the pager (for testing)")
     parser.add_argument('-o', '--os', metavar='NAME', choices=['ubuntu'],
                         help='Run a specified Operating System')
     parser.add_argument('-r', '--run', action='store_true',

test/py/tests/test_distro.py

@@ -84,7 +84,7 @@ def test_distro_arm_app_extlinux(ubman):
         ubman.run_command('bootmeth order extlinux')
         ubman.run_command('boot', wait_for_prompt=False)
 
-        ubman.expect(["Booting bootflow 'efi_media.bootdev.part_2' with extlinux"])
+        ubman.expect(["Booting bootflow 'efi_media_1.bootdev.part_2' with extlinux"])
         ubman.expect(['Exiting EFI'])
         ubman.expect(['Booting Linux on physical CPU'])
 
@@ -102,16 +102,24 @@ def test_distro_arm_app_efi(ubman):
         ubman.run_command('bootmeth order efi')
         ubman.run_command('boot', wait_for_prompt=False)
 
-        ubman.expect(["Booting bootflow 'efi_media.bootdev.part_1' with efi"])
+        ubman.expect(
+            ["Booting bootflow 'efi_media_1.bootdev.part_1' with efi"])
 
         # Press Escape to force GRUB to appear, even if the silent menu was
-        # enabled by a previous boot
+        # enabled by a previous boot. If the menu is already set to appear, this
+        # will exit to the grub> prompt
+        ubman.send('\x1b')
+
+        # Press Escape again, to force it to the grub> prompt
         ubman.send('\x1b')
 
     # Wait until we see the editor appear
     with ubman.log.section('grub'):
+        ubman.expect(['grub>'])
+
+        ubman.run_command('normal', wait_for_prompt=False)
+
         ubman.expect(['ESC to return previous'])
-        # ubman.expect(['The highlighted entry will be executed automatically in 29s'])
 
         # Press 'e' to edit the command line
         ubman.log.info("Pressing 'e'")