3a5ba30c13
* https://github.com/fwupd/fwupd/releases/tag/1.5.0 * https://github.com/fwupd/fwupd/releases/tag/1.5.1 * The changelog mentions removed dependency on efivar but we still need the package because it also contains efiboot required dependency. https://github.com/fwupd/fwupd/pull/2485 * Blacklist options were renamed. * Test firmware was moved to a separate repo. We need to install it or some tests will be skipped. https://github.com/fwupd/fwupd/pull/2330 * Initially, there was an option to configure dbx but in the end, it was removed in favour of bespoke dbxtool. https://github.com/fwupd/fwupd/pull/2061, https://github.com/fwupd/fwupd/pull/2318, https://github.com/fwupd/fwupd/pull/2329 * Fwupd now checks hashes of plug-ins and will complain loudly that it is tainted when “invalid” plug-in is loaded (during testing). * Installed tests complain about not being able to access cdn, even though we are not setting CI_NETWORK env var. We need a patch to fix that.
48 lines
2.6 KiB
Diff
48 lines
2.6 KiB
Diff
diff --git a/data/device-tests/hardware.py b/data/device-tests/hardware.py
|
||
index 7f1e1907..10fee1b8 100755
|
||
--- a/data/device-tests/hardware.py
|
||
+++ b/data/device-tests/hardware.py
|
||
@@ -1,4 +1,4 @@
|
||
-#!/usr/bin/python3
|
||
+#!@installedTestsPython@/bin/python3
|
||
# pylint: disable=wrong-import-position,too-many-locals,unused-argument,wrong-import-order
|
||
#
|
||
# Copyright (C) 2017 Richard Hughes <richard@hughsie.com>
|
||
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
|
||
index adadbcdd..1b51bb9c 100644
|
||
--- a/data/installed-tests/meson.build
|
||
+++ b/data/installed-tests/meson.build
|
||
@@ -65,5 +65,5 @@ configure_file(
|
||
output : 'fwupd-tests.conf',
|
||
configuration : con2,
|
||
install: true,
|
||
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
|
||
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
|
||
)
|
||
diff --git a/meson.build b/meson.build
|
||
index 772b7bbe..f59302cd 100644
|
||
--- a/meson.build
|
||
+++ b/meson.build
|
||
@@ -177,8 +177,8 @@ else
|
||
datadir = join_paths(prefix, get_option('datadir'))
|
||
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
|
||
localstatedir = join_paths(prefix, get_option('localstatedir'))
|
||
- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
|
||
- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
|
||
+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
|
||
+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
|
||
endif
|
||
mandir = join_paths(prefix, get_option('mandir'))
|
||
localedir = join_paths(prefix, get_option('localedir'))
|
||
diff --git a/meson_options.txt b/meson_options.txt
|
||
index 0a0e2853..5f68d78b 100644
|
||
--- a/meson_options.txt
|
||
+++ b/meson_options.txt
|
||
@@ -25,6 +26,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable
|
||
option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
|
||
option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
|
||
option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
|
||
+option('installed_test_prefix', type: 'string', description: 'Prefix for installed tests')
|
||
option('tests', type : 'boolean', value : true, description : 'enable tests')
|
||
option('tpm', type : 'boolean', value : true, description : 'enable TPM support')
|
||
option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
|