[PATCH v2 3/3] scripts: Adapt mock-noinline.py to ATTRIBUTE_MOCKABLE
From: Michal Privoznik <mprivozn(a)redhat.com>
The script is renamed to mockable-attribute.py and adjusted to
check for the new attribute.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
build-aux/syntax-check.mk | 4 ++--
scripts/meson.build | 2 +-
scripts/{mock-noinline.py => mockable-attribute.py} | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
rename scripts/{mock-noinline.py => mockable-attribute.py} (91%)
diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index d414e033df..09d3a5620c 100644
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -1326,9 +1326,9 @@ sc_spacing-check:
$(PERL) $(top_srcdir)/build-aux/check-spacing.pl || \
{ echo 'incorrect formatting' 1>&2; exit 1; }
-sc_mock-noinline:
+sc_mockable-attribute:
$(AM_V_GEN)$(VC_LIST_EXCEPT) | $(GREP) '\.[ch]$$' | $(RUNUTF8) \
- $(PYTHON) $(top_srcdir)/scripts/mock-noinline.py
+ $(PYTHON) $(top_srcdir)/scripts/mockable-attribute.py
sc_header-ifdef:
$(AM_V_GEN)$(VC_LIST_EXCEPT) | $(GREP) '\.[h]$$' | $(RUNUTF8) xargs \
diff --git a/scripts/meson.build b/scripts/meson.build
index 2798e302ab..15a23e8738 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -29,7 +29,7 @@ scripts = [
'meson-install-web.py',
'meson-python.sh',
'meson-timestamp.py',
- 'mock-noinline.py',
+ 'mockable-attribute.py',
'prohibit-duplicate-header.py',
'qemu-replies-tool.py',
]
diff --git a/scripts/mock-noinline.py b/scripts/mockable-attribute.py
similarity index 91%
rename from scripts/mock-noinline.py
rename to scripts/mockable-attribute.py
index 77a5ca23e2..c6695773e7 100755
--- a/scripts/mock-noinline.py
+++ b/scripts/mockable-attribute.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2017-2019 Red Hat, Inc.
+# Copyright (C) 2017-2025 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@ import sys
noninlined = {}
mocked = {}
-# Functions in public header don't get the noinline annotation
+# Functions in public header don't get the noipa annotation
noninlined["virEventAddTimeout"] = True
# This one confuses the script as its defined in the mock file
# but is actually just a local helper
@@ -43,7 +43,7 @@ def scan_annotations(filename):
elif line.isspace():
func = None
- if "G_NO_INLINE" in line:
+ if "ATTRIBUTE_MOCKABLE" in line:
if func is not None:
noninlined[func] = True
@@ -74,7 +74,7 @@ warned = False
for func in mocked.keys():
if func not in noninlined:
warned = True
- print("%s is mocked at %s but missing 'G_NO_INLINE' annotation"
%
+ print("%s is mocked at %s but missing 'ATTRIBUTE_MOCKABLE'
annotation" %
(func, mocked[func]), file=sys.stderr)
if warned:
--
2.49.0