From 0bc22fb6f78b1f28ff972430f717ca35cf612223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 3 Apr 2019 11:47:23 +0100 Subject: [PATCH] Remove patching on mock-noinline.pl which is missing in dist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- ...tests-fix-mocking-of-stat-lstat-functions.patch | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/0001-tests-fix-mocking-of-stat-lstat-functions.patch b/0001-tests-fix-mocking-of-stat-lstat-functions.patch index 3dcf1af..5bf3c59 100644 --- a/0001-tests-fix-mocking-of-stat-lstat-functions.patch +++ b/0001-tests-fix-mocking-of-stat-lstat-functions.patch @@ -79,20 +79,6 @@ Signed-off-by: Daniel P. Berrangé 10 files changed, 413 insertions(+), 527 deletions(-) create mode 100644 tests/virmockstathelpers.c -diff --git a/build-aux/mock-noinline.pl b/build-aux/mock-noinline.pl -index c6b40001c5..958e133885 100644 ---- a/build-aux/mock-noinline.pl -+++ b/build-aux/mock-noinline.pl -@@ -6,6 +6,9 @@ my %mocked; - # Functions in public header don't get the noinline annotation - # so whitelist them here - $noninlined{"virEventAddTimeout"} = 1; -+# This one confuses the script as its defined in the mock file -+# but is actually just a local helper -+$noninlined{"virMockStatRedirect"} = 1; - - foreach my $arg (@ARGV) { - if ($arg =~ /\.h$/) { diff --git a/cfg.mk b/cfg.mk index 8594f64482..5ffae32f2a 100644 --- a/cfg.mk