~ruther/guix-local: gnu: qemu-minimal: Fix building with ipxe-qemu.

e0b8a6e395462558ecf068d30a255a8431fe75ea — Efraim Flashner 1 year, 1 month ago 3ead13a

gnu: qemu-minimal: Fix building with ipxe-qemu.

* gnu/packages/virtualization.scm (qemu)[arguments]: Adjust the
'dont-require-ipxe-firmware phase to skip more tests.

Change-Id: I2d308e9eec48ec9b087fc0a7ed9e6d8089366c9e

patch browse .tar.gz .zip

1 files changed, 5 insertions(+), 14 deletions(-)

M gnu/packages/virtualization.scm

M gnu/packages/virtualization.scm => gnu/packages/virtualization.scm +5 -14

@@ 316,20 316,11 @@
                       (lambda _
                         (substitute* "pc-bios/meson.build"
                           ((".*(pxe|efi)-.*") ""))
-                        (substitute* "tests/qtest/meson.build"
-                          ((".*qom-test.*") "")
-                          ((".*qos-test.*") "")
-                          ((".*test-hmp.*") "")
-                          ((".*'pxe-test':.*") "")
-                          ((",? ?'boot-serial-test',?") "")
-                          ((",? ?'endianness-test',?") "")
-                          ((",? ?'prom-env-test',?") "")
-                          ((",? ?'pxe-test',?") "")
-                          ((",? ?'test-filter-mirror',?") "")
-                          ((",? ?'test-filter-redirector',?") "")
-                          ((",? ?'test-netfilter',?") "")
-                          ;; Fix the slow_qtests array after the substitutions
-                          (("  : .*") "")))))
+                        ;; Skip all the tests in tests/qtest instead
+                        ;; of cherry-picking the tests which need the
+                        ;; ipxe-qemu firmware.
+                        (substitute* "tests/meson.build"
+                          (("subdir.*qtest.*") "")))))
                  #~())
           (add-after 'unpack 'extend-test-time-outs
             (lambda _