ahill/kmod
1
0
Fork 0
mirror of https://github.com/kmod-project/kmod.git synced 2026-01-26 15:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

testsuite/path: match the full rootpath

Browse Source 
Our expectation is that the (full) rootpath is present, otherwise we
prepend it ourselves. Drop the ABS_TOP_BUILDDIR instance.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/86
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
This commit is contained in:
Emil Velikov 2024-08-22 17:04:21 +01:00 committed by Lucas De Marchi
parent e13674d075
commit ae0c0c4c89
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -232,8 +232,6 @@ EXTRA_DIST += \
check_LTLIBRARIES = $(TESTSUITE_OVERRIDE_LIBS)
testsuite_uname_la_LDFLAGS = $(TESTSUITE_OVERRIDE_LIBS_LDFLAGS)
testsuite_path_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"
testsuite_path_la_LDFLAGS = $(TESTSUITE_OVERRIDE_LIBS_LDFLAGS)
testsuite_delete_module_la_LDFLAGS = $(TESTSUITE_OVERRIDE_LIBS_LDFLAGS)

1
shared/util.h
View File

@ -16,6 +16,7 @@
/* ************************************************************************ */
#define streq(a, b) (strcmp((a), (b)) == 0)
#define strstartswith(a, b) (strncmp(a, b, strlen(b)) == 0)
#define strnstartswith(a, b, n) (strncmp(a, b, n) == 0)
char *strchr_replace(char *s, char c, char r);
void *memdup(const void *p, size_t n) __attribute__((nonnull(1)));

2
testsuite/path.c
View File

@ -33,7 +33,7 @@ static size_t rootpathlen;
static inline bool need_trap(const char *path)
{
return path != NULL && path[0] == '/'
&& !strstartswith(path, ABS_TOP_BUILDDIR);
&& !strnstartswith(path, rootpath, rootpathlen);
}
static const char *trap_path(const char *path, char buf[PATH_MAX * 2])