7:36 a.m.
The intent is that this library is going to be called every time
to check if we are not touching anything outside srcdir or
builddir.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
cfg.mk | 2 +-
tests/Makefile.am | 13 +++-
tests/testutils.c | 9 +++
tests/testutils.h | 10 +--
tests/vircgroupmock.c | 15 ++---
tests/virpcimock.c | 14 ++--
tests/virtestmock.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 210 insertions(+), 28 deletions(-)
create mode 100644 tests/virtestmock.c
diff --git a/cfg.mk b/cfg.mk
index b277db1..c0aba57 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1164,7 +1164,7 @@ exclude_file_name_regexp--sc_copyright_usage = \
^COPYING(|\.LESSER)$$
exclude_file_name_regexp--sc_flags_usage = \
-
^(cfg\.mk|docs/|src/util/virnetdevtap\.c$$|tests/(vir(cgroup|pci|usb)|nss|qemuxml2argv)mock\.c$$)
+
^(cfg\.mk|docs/|src/util/virnetdevtap\.c$$|tests/(vir(cgroup|pci|test|usb)|nss|qemuxml2argv)mock\.c$$)
exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \
^(src/rpc/gendispatch\.pl$$|tests/)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 75efb90..da68f2e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,9 @@
# old automake does not provide abs_{src,build}dir variables
abs_builddir = $(shell pwd)
+abs_topbuilddir = $(shell cd .. && pwd)
abs_srcdir = $(shell cd $(srcdir) && pwd)
+abs_topsrcdir = $(shell cd $(top_srcdir) && pwd)
SHELL = $(PREFERABLY_POSIX_SHELL)
@@ -33,7 +35,9 @@ INCLUDES = \
AM_CFLAGS = \
-Dabs_builddir="\"$(abs_builddir)\"" \
+ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \
-Dabs_srcdir="\"$(abs_srcdir)\"" \
+ -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \
$(LIBXML_CFLAGS) \
$(LIBNL_CFLAGS) \
$(GNUTLS_CFLAGS) \
@@ -443,6 +447,7 @@ endif WITH_DBUS
if WITH_LINUX
test_libraries += virusbmock.la \
virnetdevbandwidthmock.la \
+ virtestmock.la
$(NULL)
endif WITH_LINUX
@@ -1142,9 +1147,15 @@ virnetdevbandwidthmock_la_CFLAGS = $(AM_CFLAGS)
virnetdevbandwidthmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
virnetdevbandwidthmock_la_LIBADD = $(MOCKLIBS_LIBS)
+virtestmock_la_SOURCES = \
+ virtestmock.c
+virtestmock_la_CFLAGS = $(AM_CFLAGS)
+virtestmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
+virtestmock_la_LIBADD = $(MOCKLIBS_LIBS)
else ! WITH_LINUX
EXTRA_DIST += virusbtest.c virusbmock.c \
- virnetdevbandwidthtest.c virnetdevbandwidthmock.c
+ virnetdevbandwidthtest.c virnetdevbandwidthmock.c \
+ virtestmock.c
endif ! WITH_LINUX
if WITH_DBUS
diff --git a/tests/testutils.c b/tests/testutils.c
index 79d0763..595b64d 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -832,8 +832,11 @@ virTestSetEnvPath(void)
return ret;
}
+#define TEST_MOCK (abs_builddir "/.libs/virtestmock.so")
+
int virtTestMain(int argc,
char **argv,
+ const char *lib,
int (*func)(void))
{
int ret;
@@ -842,6 +845,12 @@ int virtTestMain(int argc,
char *oomstr;
#endif
+#ifdef __linux__
+ VIRT_TEST_PRELOAD(TEST_MOCK);
+#endif
+ if (lib)
+ VIRT_TEST_PRELOAD(lib);
+
virFileActivateDirOverride(argv[0]);
if (virTestSetEnvPath() < 0)
diff --git a/tests/testutils.h b/tests/testutils.h
index 123a4fb..d1caf20 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -102,12 +102,13 @@ const char *virtTestCounterNext(void);
int virtTestMain(int argc,
char **argv,
+ const char *lib,
int (*func)(void));
/* Setup, then call func() */
-# define VIRT_TEST_MAIN(func) \
- int main(int argc, char **argv) { \
- return virtTestMain(argc, argv, func); \
+# define VIRT_TEST_MAIN(func) \
+ int main(int argc, char **argv) { \
+ return virtTestMain(argc, argv, NULL, func); \
}
# define VIRT_TEST_PRELOAD(lib) \
@@ -132,8 +133,7 @@ int virtTestMain(int argc,
# define VIRT_TEST_MAIN_PRELOAD(func, lib) \
int main(int argc, char **argv) { \
- VIRT_TEST_PRELOAD(lib); \
- return virtTestMain(argc, argv, func); \
+ return virtTestMain(argc, argv, lib, func); \
}
virCapsPtr virTestGenericCapsInit(void);
diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index cfc51e8..cd0eb34 100644
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -405,19 +405,12 @@ static void init_syms(void)
} \
} while (0)
-# define LOAD_SYM_ALT(name1, name2) \
- do { \
- if (!(real ## name1 = dlsym(RTLD_NEXT, #name1)) && \
- !(real ## name2 = dlsym(RTLD_NEXT, #name2))) { \
- fprintf(stderr, "Cannot find real '%s' or '%s'
symbol\n", #name1, #name2); \
- abort(); \
- } \
- } while (0)
-
LOAD_SYM(fopen);
LOAD_SYM(access);
- LOAD_SYM_ALT(lstat, __lxstat);
- LOAD_SYM_ALT(stat, __xstat);
+ LOAD_SYM(lstat);
+ LOAD_SYM(__lxstat);
+ LOAD_SYM(stat);
+ LOAD_SYM(__xstat);
LOAD_SYM(mkdir);
LOAD_SYM(open);
}
diff --git a/tests/virpcimock.c b/tests/virpcimock.c
index cfe42a6..48a6e7f 100644
--- a/tests/virpcimock.c
+++ b/tests/virpcimock.c
@@ -781,17 +781,11 @@ init_syms(void)
ABORT("Cannot find real '%s' symbol\n", #name);
\
} while (0)
-# define LOAD_SYM_ALT(name1, name2) \
- do { \
- if (!(real ## name1 = dlsym(RTLD_NEXT, #name1)) && \
- !(real ## name2 = dlsym(RTLD_NEXT, #name2))) \
- ABORT("Cannot find real '%s' or '%s' symbol\n",
\
- #name1, #name2); \
- } while (0)
-
LOAD_SYM(access);
- LOAD_SYM_ALT(lstat, __lxstat);
- LOAD_SYM_ALT(stat, __xstat);
+ LOAD_SYM(lstat);
+ LOAD_SYM(__lxstat);
+ LOAD_SYM(stat);
+ LOAD_SYM(__xstat);
LOAD_SYM(canonicalize_file_name);
LOAD_SYM(open);
LOAD_SYM(close);
diff --git a/tests/virtestmock.c b/tests/virtestmock.c
new file mode 100644
index 0000000..5c39b89
--- /dev/null
+++ b/tests/virtestmock.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2016 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>;.
+ *
+ * Author: Michal Privoznik <mprivozn(a)redhat.com>
+ */
+
+#include <config.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <dlfcn.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "internal.h"
+#include "configmake.h"
+
+static int (*realopen)(const char *path, int flags, ...);
+static FILE *(*realfopen)(const char *path, const char *mode);
+static int (*realaccess)(const char *path, int mode);
+static int (*realstat)(const char *path, struct stat *sb);
+static int (*real__xstat)(int ver, const char *path, struct stat *sb);
+static int (*reallstat)(const char *path, struct stat *sb);
+static int (*real__lxstat)(int ver, const char *path, struct stat *sb);
+
+static void init_syms(void)
+{
+ if (realopen)
+ return;
+
+#define LOAD_SYM(name) \
+ do { \
+ if (!(real ## name = dlsym(RTLD_NEXT, #name))) { \
+ fprintf(stderr, "Cannot find real '%s' symbol\n", #name);
\
+ abort(); \
+ } \
+ } while (0)
+
+#define LOAD_SYM_ALT(name1, name2) \
+ do { \
+ if (!(real ## name1 = dlsym(RTLD_NEXT, #name1)) && \
+ !(real ## name2 = dlsym(RTLD_NEXT, #name2))) { \
+ fprintf(stderr, "Cannot find real '%s' or '%s'
symbol\n", #name1, #name2); \
+ abort(); \
+ } \
+ } while (0)
+
+ LOAD_SYM(open);
+ LOAD_SYM(fopen);
+ LOAD_SYM(access);
+ LOAD_SYM_ALT(stat, __xstat);
+ LOAD_SYM_ALT(lstat, __lxstat);
+}
+
+static void
+checkPath(const char *path ATTRIBUTE_UNUSED)
+{
+ /* Nada */
+}
+
+
+int open(const char *path, int flags, ...)
+{
+ int ret;
+
+ init_syms();
+
+ checkPath(path);
+
+ if (flags & O_CREAT) {
+ va_list ap;
+ mode_t mode;
+ va_start(ap, flags);
+ mode = va_arg(ap, mode_t);
+ va_end(ap);
+ ret = realopen(path, flags, mode);
+ } else {
+ ret = realopen(path, flags);
+ }
+ return ret;
+}
+
+FILE *fopen(const char *path, const char *mode)
+{
+ init_syms();
+
+ checkPath(path);
+
+ return realfopen(path, mode);
+}
+
+
+int access(const char *path, int mode)
+{
+ init_syms();
+
+ checkPath(path);
+
+ return realaccess(path, mode);
+}
+
+int stat(const char *path, struct stat *sb)
+{
+ init_syms();
+
+ checkPath(path);
+
+ if (!realstat)
+ return real__xstat(1, path, sb);
+
+ return realstat(path, sb);
+}
+
+int
+__xstat(int ver, const char *path, struct stat *sb)
+{
+ init_syms();
+
+ checkPath(path);
+ if (!real__xstat) {
+ if (ver == 1) {
+ return realstat(path, sb);
+ } else {
+ fprintf(stderr, "Not handled __xstat(ver=%d)", ver);
+ abort();
+ }
+ }
+
+ return real__xstat(ver, path, sb);
+}
+
+int
+lstat(const char *path, struct stat *sb)
+{
+ init_syms();
+
+ checkPath(path);
+
+ if (!reallstat)
+ return real__lxstat(1, path, sb);
+
+ return reallstat(path, sb);
+}
+
+int
+__lxstat(int ver, const char *path, struct stat *sb)
+{
+ init_syms();
+
+ checkPath(path);
+ if (!real__lxstat) {
+ if (ver == 1) {
+ return reallstat(path, sb);
+ } else {
+ fprintf(stderr, "Not handled __lxstat(ver=%d)", ver);
+ abort();
+ }
+ }
+
+ return real__lxstat(ver, path, sb);
+}
--
2.8.1