travis: Add efi_loader grub2 test

test/py/tests/test_efi_loader.py +7 -0

 
+ at pytest.mark.buildconfigspec('cmd_bootefi')
 
+    u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)
+
+    # Verify that we have an SMBIOS table
+    check_smbios = u_boot_console.config.env.get('env__efi_loader_check_smbios', False)
+    if check_smbios:
+        u_boot_console.wait_for('grub>')

Quoted 5 lines · Alexander Graf

We have all the building blocks now to run arbitrary efi applications in travis. The most important one out there is grub2, so let's add a simple test to verify that grub2 still comes up.

.travis.yml +0 -0

.travis.yml install: · line 53

Quoted 7 lines

.travis.yml +3 -0

@@ -45,6 +48,9 @@ install:
 - virtualenv /tmp/venv
 - . /tmp/venv/bin/activate
 - pip install pytest
+ - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
+ - mkdir ~/grub2-arm
+ - ( cd ~/grub2-arm; wget -O - http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/suse/armv7hl/grub2-arm-efi-2.02~beta2-87.1.armv7hl.rpm | rpm2cpio | cpio -di )

Do we really want to do this for all the build-only jobs too? I might have expected to do this inside the test scripts that actually use those binaries.

Quoted 7 lines · Stephen Warren

Quoted 5 lines · Alexander Graf

We have all the building blocks now to run arbitrary efi applications in travis. The most important one out there is grub2, so let's add a simple test to verify that grub2 still comes up.

.travis.yml +0 -0

Quoted 11 lines

.travis.yml install: · line 53

Quoted 7 lines

.travis.yml +3 -0

@@ -45,6 +48,9 @@ install:
 - virtualenv /tmp/venv
 - . /tmp/venv/bin/activate
 - pip install pytest
+ - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
+ - mkdir ~/grub2-arm
+ - ( cd ~/grub2-arm; wget -O - http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/suse/armv7hl/grub2-arm-efi-2.02~beta2-87.1.armv7hl.rpm | rpm2cpio | cpio -di )

Do we really want to do this for all the build-only jobs too? I might have expected to do this inside the test scripts that actually use those binaries.

So, it's the difference between making various jobs / stanzas more correct vs taking more time to do stuff. Unless this starts to push the "catch-all" arm job over the time limit, I don't think it's a big deal either way. And since travis-ci will tell us how long a given stanza takes we'll have a good idea pretty quick on if that's starting to take too long. That said, I don't have a strong opinion here and it wouldn't be too hard to move all of this into being under the TEST_PY_BD check and since we aren't relying on apt, it's not going to be time-in-apt factor.

Quoted 23 lines · Tom Rini

Quoted 7 lines · Stephen Warren

Quoted 5 lines · Alexander Graf

We have all the building blocks now to run arbitrary efi applications in travis. The most important one out there is grub2, so let's add a simple test to verify that grub2 still comes up.

.travis.yml +0 -0

Quoted 14 lines

Quoted 10 lines

.travis.yml +1 -0

@@ -45,6 +48,9 @@ install:
 - virtualenv /tmp/venv
 - . /tmp/venv/bin/activate
 - pip install pytest
+ - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal  echo

lsefimmap lsefi lsefisystab efinet tftp minicmd
+ - mkdir ~/grub2-arm
+ - ( cd ~/grub2-arm; wget -O -
http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/suse/armv7hl/grub2-arm-efi-2.02~beta2-87.1.armv7hl.rpm
| rpm2cpio | cpio -di )

Do we really want to do this for all the build-only jobs too? I might have expected to do this inside the test scripts that actually use those binaries.

Quoted 9 lines

So, it's the difference between making various jobs / stanzas more correct vs taking more time to do stuff. Unless this starts to push the "catch-all" arm job over the time limit, I don't think it's a big deal either way. And since travis-ci will tell us how long a given stanza takes we'll have a good idea pretty quick on if that's starting to take too long. That said, I don't have a strong opinion here and it wouldn't be too hard to move all of this into being under the TEST_PY_BD check and since we aren't relying on apt, it's not going to be time-in-apt factor.

If we move it into TEST_PY_BD, we would either run the same sequence over and over again for individual tests or check if the file exists inside the generation path. Either way, it will get less readable :).

Overall, we're talking of 1s of build time for this:

https://travis-ci.org/agraf/u-boot/jobs/177000864

so I'd definitely prefer to keep it simple rather than optimized.

Quoted 11 lines · Alexander Graf

We have all the building blocks now to run arbitrary efi applications in travis. The most important one out there is grub2, so let's add a simple test to verify that grub2 still comes up.

.travis.yml +1 -0

@@ -45,6 +48,9 @@ install:
  - virtualenv /tmp/venv
  - . /tmp/venv/bin/activate
  - pip install pytest
+ - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap

Quoted 5 lines

lsefi lsefisystab efinet tftp minicmd
+ - mkdir ~/grub2-arm
+ - ( cd ~/grub2-arm; wget -O -
http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/suse/armv7hl/grub2-arm-efi-2.02~beta2-87.1.armv7hl.rpm
| rpm2cpio | cpio -di )

Do we really want to do this for all the build-only jobs too? I might have expected to do this inside the test scripts that actually use those binaries.

Quoted 21 lines

test/py/tests/test_efi_loader.py +2 -0

 
+ at pytest.mark.buildconfigspec('cmd_bootefi')
 
+    u_boot_console.run_command('bootefi %x' % addr,

wait_for_prompt=False)

test/py/tests/test_efi_loader.py +3 -0

+
+    # Verify that we have an SMBIOS table
+    check_smbios =

u_boot_console.config.env.get('env__efi_loader_check_smbios', False)

test/py/tests/test_efi_loader.py +3 -0

+    if check_smbios:
+        u_boot_console.wait_for('grub>')
+        output = u_boot_console.run_command('lsefisystab',

wait_for_prompt=False, wait_for_echo=False)

test/py/tests/test_efi_loader.py +5 -0

+        u_boot_console.wait_for('SMBIOS')
+
+    # Then exit cleanly
+    u_boot_console.wait_for('grub>')
+    output = u_boot_console.run_command('exit',

wait_for_prompt=False, wait_for_echo=False)

test/py/tests/test_efi_loader.py def test_efi_helloworld_builtin(u_boot_console): · line 195

Quoted 4 lines

test/py/tests/test_efi_loader.py +4 -0

+    u_boot_console.wait_for('r = 0')
+
+    # And give us our U-Boot prompt back
+    u_boot_console.run_command('')

I can't help wondering if adding push_prompt() function (for use in a Python "with" statement) to u_boot_console wouldn't be better; that would avoid all the wait_for_prompt=False and wait_for(prompt) logic there.

Quoted 45 lines · Stephen Warren

Quoted 16 lines · Alexander Graf

We have all the building blocks now to run arbitrary efi applications in travis. The most important one out there is grub2, so let's add a simple test to verify that grub2 still comes up.

.travis.yml +1 -0

@@ -45,6 +48,9 @@ install:
  - virtualenv /tmp/venv
  - . /tmp/venv/bin/activate
  - pip install pytest
+ - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap

lsefi lsefisystab efinet tftp minicmd
+ - mkdir ~/grub2-arm
+ - ( cd ~/grub2-arm; wget -O -
http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/suse/armv7hl/grub2-arm-efi-2.02~beta2-87.1.armv7hl.rpm

Quoted 1 line

| rpm2cpio | cpio -di )

Do we really want to do this for all the build-only jobs too? I might have expected to do this inside the test scripts that actually use those binaries.

Quoted 22 lines

test/py/tests/test_efi_loader.py +2 -0

 
+ at pytest.mark.buildconfigspec('cmd_bootefi')
 
+    u_boot_console.run_command('bootefi %x' % addr,

wait_for_prompt=False)

test/py/tests/test_efi_loader.py +3 -0

+
+    # Verify that we have an SMBIOS table
+    check_smbios =

u_boot_console.config.env.get('env__efi_loader_check_smbios', False)

test/py/tests/test_efi_loader.py +3 -0

+    if check_smbios:
+        u_boot_console.wait_for('grub>')
+        output = u_boot_console.run_command('lsefisystab',

wait_for_prompt=False, wait_for_echo=False)

test/py/tests/test_efi_loader.py +5 -0

+        u_boot_console.wait_for('SMBIOS')
+
+    # Then exit cleanly
+    u_boot_console.wait_for('grub>')
+    output = u_boot_console.run_command('exit',

wait_for_prompt=False, wait_for_echo=False)
+ u_boot_console.wait_for('r = 0')

Quoted 8 lines

test/py/tests/test_efi_loader.py def test_efi_helloworld_builtin(u_boot_console): · line 195

Quoted 3 lines

test/py/tests/test_efi_loader.py +3 -0

+
+    # And give us our U-Boot prompt back
+    u_boot_console.run_command('')

I can't help wondering if adding push_prompt() function (for use in a Python "with" statement) to u_boot_console wouldn't be better; that would avoid all the wait_for_prompt=False and wait_for(prompt) logic there.

What would that function do? The same?

We have all the building blocks now to run arbitrary efi applications in travis. The most important one out there is grub2, so let's add a simple test to verify that grub2 still comes up.

Signed-off-by Alexander Graf <[email protected]>