2b0cd7cceb
Rebased on top of Martin Wilck's queue of ACKed upstream commits * https://github.com/openSUSE/multipath-tools/tree/upstream-queue * All previous patches have been reordered, with the exception of 0011-libdmmp-Add-support-for-upcoming-json-c-0.14.0.patch which has been replaced with 0029-fix-boolean-value-with-json-c-0.14.patch Modify 0054-RH-add-mpathconf.patch * remove default enable_foreign and property blacklist_exceptions settings, and deal with the builtin default change from 0031-libmultipath-set-enable_foreign-to-NONE-by-default.patch. Fixes bz #1853668 Add 0048-Makefile.inc-trim-extra-information-from-systemd-ver.patch Add 0049-kpartx-fix-Wsign-compare-error.patch * The above two patches have been submitted upstream
34 lines
879 B
Diff
34 lines
879 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Mon, 11 May 2020 23:43:02 +0200
|
|
Subject: [PATCH] multipath-tools tests/test-lib.c: drop
|
|
__wrap_is_claimed_by_foreign
|
|
|
|
is_claimed_by_foreign() is an inline function and can't be wrapped.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
tests/test-lib.c | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
diff --git a/tests/test-lib.c b/tests/test-lib.c
|
|
index 59275163..00bae58e 100644
|
|
--- a/tests/test-lib.c
|
|
+++ b/tests/test-lib.c
|
|
@@ -56,12 +56,6 @@ int __wrap_execute_program(char *path, char *value, int len)
|
|
return 0;
|
|
}
|
|
|
|
-bool __wrap_is_claimed_by_foreign(struct udev_device *ud)
|
|
-{
|
|
- condlog(5, "%s: %p", __func__, ud);
|
|
- return false;
|
|
-}
|
|
-
|
|
struct udev_list_entry
|
|
*__wrap_udev_device_get_properties_list_entry(struct udev_device *ud)
|
|
{
|
|
--
|
|
2.17.2
|
|
|