diff --git a/debian/changelog b/debian/changelog index d208f506d..031a3959d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +fwupd (1.7.7-1ubuntu1) kinetic; urgency=medium + + * Skip mtd tests if not working off mtdram (LP: #1973598) + + d/p/0002-trivial-skip-mtd-tests-if-not-working-off-mtdram-tes.patch + * d/t/ci: try loading the mtdram module to execute mtd tests + + -- Lukas Märdian Tue, 17 May 2022 12:49:19 +0200 + fwupd (1.7.7-1) unstable; urgency=medium * New upstream version (1.7.7) diff --git a/debian/patches/0002-trivial-skip-mtd-tests-if-not-working-off-mtdram-tes.patch b/debian/patches/0002-trivial-skip-mtd-tests-if-not-working-off-mtdram-tes.patch new file mode 100644 index 000000000..bf79efc7f --- /dev/null +++ b/debian/patches/0002-trivial-skip-mtd-tests-if-not-working-off-mtdram-tes.patch @@ -0,0 +1,34 @@ +From: Mario Limonciello +Date: Mon, 16 May 2022 10:35:18 -0500 +Subject: trivial: skip mtd tests if not working off mtdram test device (LP: + #1973598) + +--- + plugins/mtd/fu-self-test.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/plugins/mtd/fu-self-test.c b/plugins/mtd/fu-self-test.c +index 9d23f5c..cfee5ca 100644 +--- a/plugins/mtd/fu-self-test.c ++++ b/plugins/mtd/fu-self-test.c +@@ -26,6 +26,7 @@ fu_test_mtd_device_func(void) + g_autoptr(GRand) rand = g_rand_new_with_seed(0); + g_autoptr(GUdevClient) udev_client = g_udev_client_new(NULL); + g_autoptr(GUdevDevice) udev_device = NULL; ++ const gchar *dev_name; + + /* do not save silo */ + ret = fu_context_load_quirks(ctx, FU_QUIRKS_LOAD_FLAG_NO_CACHE, &error); +@@ -49,6 +50,12 @@ fu_test_mtd_device_func(void) + g_assert_no_error(error); + g_assert_nonnull(locker); + ++ dev_name = fu_device_get_name(device); ++ if (g_strcmp0(dev_name, "mtdram test device") != 0) { ++ g_test_skip("device is not mtdram test device"); ++ return; ++ } ++ + bufsz = fu_device_get_firmware_size_max(device); + g_assert_cmpint(bufsz, ==, 0x400000); + diff --git a/debian/patches/series b/debian/patches/series index b6dea009f..9cb02d41f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-trivial-Add-a-new-configuration-option-systemd_unit_.patch +0002-trivial-skip-mtd-tests-if-not-working-off-mtdram-tes.patch diff --git a/debian/tests/ci b/debian/tests/ci index 39a306f63..f937041d3 100755 --- a/debian/tests/ci +++ b/debian/tests/ci @@ -1,5 +1,7 @@ #!/bin/sh set -e +# try loading the mtdram module to run our mtd tests +modprobe mtdram || true sed "s,^DisabledPlugins=.*,DisabledPlugins=," -i /etc/fwupd/daemon.conf sed "s,^VerboseDomains=.*,VerboseDomains=*," -i /etc/fwupd/daemon.conf sed "s,ConditionVirtualization=.*,," \