Re: [PATCH 2/4] tests: Introduce global mock library

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 21/04/16 12:16, Michal Privoznik wrote:
> 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@xxxxxxxxxx>
> ---
>  cfg.mk                |   2 +-
>  tests/Makefile.am     |  13 +++-
>  tests/testutils.c     |  33 +++++++++
>  tests/testutils.h     |  29 ++------
>  tests/vircgroupmock.c |   6 +-
>  tests/virpcimock.c    |   6 +-
>  tests/virtestmock.c   | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  7 files changed, 241 insertions(+), 28 deletions(-)
>  create mode 100644 tests/virtestmock.c
> 
...

>  virCapsPtr virTestGenericCapsInit(void);
> diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
> index cfc51e8..395254b 100644
> --- a/tests/vircgroupmock.c
> +++ b/tests/vircgroupmock.c
> @@ -416,8 +416,10 @@ static void init_syms(void)
>  
>      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);
>  }

I wondered why this change ^^ was necessary, but then realized the tests
would crash for some reason that is unknown to me.

> diff --git a/tests/virtestmock.c b/tests/virtestmock.c
> new file mode 100644
> index 0000000..f138e98
> --- /dev/null
> +++ b/tests/virtestmock.c
> @@ -0,0 +1,180 @@
> +/*
> + * Copyright (C) 2014 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@xxxxxxxxxx>
> + */
> +
> +#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)
> +{
> +    if (!STRPREFIX(path, abs_topsrcdir) &&
> +        !STRPREFIX(path, abs_topbuilddir)) {
> +        /* Okay, this is a dummy check and spurious print.
> +         * But this is going to be replaced soon. */
> +        fprintf(stderr, "*** %s ***\n", path);
> +    }
> +}
> +
> +
> +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);
> +}
> 

The patch works, it also looks reasonable to me, but I'm far from being
a master in this matter, so let's wait if someone would like to chime in
and express their opinion. If not, I say ACK.

Erik

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]