openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: Only mock $INODE64 symbols on x86_64 macOS 

The version of macOS running on Apple Silicon doesn't need to
concern itself with backwards compatibility with 32-bit
applications, and so it could jettison all the symbol aliasing
shenanigans involved.

https://gitlab.com/libvirt/libvirt/-/issues/121

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>
Tested-by: Roman Bolshakov <r.bolshakov@yadro.com>
This commit is contained in:
Andrea Bolognani 2021-02-04 15:48:18 +01:00
parent aebb2b6edf
commit 0ad938adc0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/virfilewrapper.c
View File

@ -56,7 +56,7 @@ static void init_syms(void)
VIR_MOCK_REAL_INIT(access); VIR_MOCK_REAL_INIT(access);
VIR_MOCK_REAL_INIT(mkdir); VIR_MOCK_REAL_INIT(mkdir);
VIR_MOCK_REAL_INIT(open); VIR_MOCK_REAL_INIT(open);
# ifdef __APPLE__ # if defined(__APPLE__) && defined(__x86_64__)
VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64"); VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64");
# else # else
VIR_MOCK_REAL_INIT(opendir); VIR_MOCK_REAL_INIT(opendir);

4
tests/virmockstathelpers.c
View File

@ -161,7 +161,7 @@ static void virMockStatInit(void)
debug = getenv("VIR_MOCK_STAT_DEBUG"); debug = getenv("VIR_MOCK_STAT_DEBUG");
#ifdef MOCK_STAT #ifdef MOCK_STAT
# ifdef __APPLE__ # if defined(__APPLE__) && defined(__x86_64__)
VIR_MOCK_REAL_INIT_ALIASED(stat, "stat$INODE64"); VIR_MOCK_REAL_INIT_ALIASED(stat, "stat$INODE64");
# else # else
VIR_MOCK_REAL_INIT(stat); VIR_MOCK_REAL_INIT(stat);
@ -181,7 +181,7 @@ static void virMockStatInit(void)
fdebug("real __xstat64 %p\n", real___xstat64); fdebug("real __xstat64 %p\n", real___xstat64);
#endif #endif
#ifdef MOCK_LSTAT #ifdef MOCK_LSTAT
# ifdef __APPLE__ # if defined(__APPLE__) && defined(__x86_64__)
VIR_MOCK_REAL_INIT_ALIASED(lstat, "lstat$INODE64"); VIR_MOCK_REAL_INIT_ALIASED(lstat, "lstat$INODE64");
# else # else
VIR_MOCK_REAL_INIT(lstat); VIR_MOCK_REAL_INIT(lstat);

2
tests/virpcimock.c
View File

@ -936,7 +936,7 @@ init_syms(void)
VIR_MOCK_REAL_INIT(__open_2); VIR_MOCK_REAL_INIT(__open_2);
# endif /* ! __GLIBC__ */ # endif /* ! __GLIBC__ */
VIR_MOCK_REAL_INIT(close); VIR_MOCK_REAL_INIT(close);
# ifdef __APPLE__ # if defined(__APPLE__) && defined(__x86_64__)
VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64"); VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64");
# else # else
VIR_MOCK_REAL_INIT(opendir); VIR_MOCK_REAL_INIT(opendir);