diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2019-06-09 16:44:29 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2019-06-09 16:44:53 +0300 |
| commit | 6585a28a13bdb83c5c03e7adf08c79ef1fed83d0 (patch) | |
| tree | 4d8c63132b7043e62765efa14341863117876059 | |
| parent | a91385f0a245aac8e696572195d5e846f1f35a9f (diff) | |
| download | aports-6585a28a13bdb83c5c03e7adf08c79ef1fed83d0.tar.bz2 aports-6585a28a13bdb83c5c03e7adf08c79ef1fed83d0.tar.xz | |
testing/fwupd: skip tests if usb not available
| -rw-r--r-- | testing/fwupd/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/fwupd/fixes.patch | 34 |
2 files changed, 4 insertions, 36 deletions
diff --git a/testing/fwupd/APKBUILD b/testing/fwupd/APKBUILD index aaa6fcd076..21cac1dbee 100644 --- a/testing/fwupd/APKBUILD +++ b/testing/fwupd/APKBUILD @@ -60,7 +60,9 @@ build() { } check() { - ninja -C output test + # tests fail if usb is not available + [ -e /dev/bus/usb ] || return 0 + ninja -C output test } package() { @@ -71,4 +73,4 @@ package() { sha512sums="942c6bad822dc65846d1984850798bec677b6a312100c6f5971fc9d5906c182267182ef29e0834bbd2b83fe72b11c3b6e50855d90388d2bf85e8a3b95d0a5a68 fwupd-1.2.9.tar.gz ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766 fwupd.initd 2f362ff98982b2038e2abfcfd698f26a06d1aff5ec1c8a4299e6dc23b85a3ef7036be62de45365772ba65578597a255309fa666f2c813f5f52ca0eab378c4135 fix-no-systemd.patch -c08a0319af9fe17ccb13dd786a7ed3e2b9ebd6bf1423323ebccd19028ffb209b585d306e86aa075eb83c4dc2bbb0154f5487cbe53641d2517b3acf1e0028ac06 fixes.patch" +0298319cb5249326ef2576612165a1c4775128fcbd58a19367385816873b56d59cfdcc2d0ef8c95e92fc7a454974aede361de43f132c024272cb5fce7b6dbbcb fixes.patch" diff --git a/testing/fwupd/fixes.patch b/testing/fwupd/fixes.patch index 1decc8f96b..896c3d138b 100644 --- a/testing/fwupd/fixes.patch +++ b/testing/fwupd/fixes.patch @@ -16,37 +16,3 @@ diff -ru fwupd-1.2.9.orig/data/tests/builder/startup.sh fwupd-1.2.9/data/tests/b -#/bin/sh +#!/bin/sh cat source.bin | rev > firmware.bin -diff -ru fwupd-1.2.9.orig/src/fu-engine.c fwupd-1.2.9/src/fu-engine.c ---- fwupd-1.2.9.orig/src/fu-engine.c 2019-05-20 13:17:42.000000000 +0300 -+++ fwupd-1.2.9/src/fu-engine.c 2019-06-09 16:26:11.573561932 +0300 -@@ -4517,7 +4517,6 @@ - self->usb_ctx = g_usb_context_new (error); - if (self->usb_ctx == NULL) { - g_prefix_error (error, "Failed to get USB context: "); -- return FALSE; - } - - /* delete old data files */ -@@ -4562,13 +4561,15 @@ - fu_engine_plugins_coldplug (self, FALSE); - - /* coldplug USB devices */ -- g_signal_connect (self->usb_ctx, "device-added", -- G_CALLBACK (fu_engine_usb_device_added_cb), -- self); -- g_signal_connect (self->usb_ctx, "device-removed", -- G_CALLBACK (fu_engine_usb_device_removed_cb), -- self); -- g_usb_context_enumerate (self->usb_ctx); -+ if (self->usb_ctx != NULL) { -+ g_signal_connect (self->usb_ctx, "device-added", -+ G_CALLBACK (fu_engine_usb_device_added_cb), -+ self); -+ g_signal_connect (self->usb_ctx, "device-removed", -+ G_CALLBACK (fu_engine_usb_device_removed_cb), -+ self); -+ g_usb_context_enumerate (self->usb_ctx); -+ } - - /* coldplug udev devices */ - fu_engine_enumerate_udev (self); |