mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
build: skip ld_preload tests on non-Linux systems
A cross build to mingw fails with: CC virsystemdtest-virsystemdtest.o ../../tests/virsystemdtest.c: In function 'testCreateNoSystemd': ../../tests/virsystemdtest.c:97:9: error: implicit declaration of function 'unsetenv' [-Werror=implicit-function-declaration] unsetenv("FAIL_NO_SERVICE"); ^ ../../tests/virsystemdtest.c:97:9: error: nested extern declaration of 'unsetenv' [-Werror=nested-externs] We could cop out and pull in the gnulib unsetenv module. But when you stop and think about it, this test requires LD_PRELOAD to work, and systemd is a Linux-only concept anyways, both of which mean the test could never work on mingw in the first place. Simpler is to just fix the test to behave like our other LD_PRELOAD tests. * tests/virsystemdtest.c: Provide non-Linux implementation. Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
0e1f012c1d
commit
caf6589233
@ -20,13 +20,16 @@
|
|||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#include "virsystemd.h"
|
|
||||||
#include "virlog.h"
|
|
||||||
#include "testutils.h"
|
#include "testutils.h"
|
||||||
|
|
||||||
#define VIR_FROM_THIS VIR_FROM_NONE
|
#ifdef __linux__
|
||||||
|
|
||||||
|
# include <stdlib.h>
|
||||||
|
|
||||||
|
# include "virsystemd.h"
|
||||||
|
# include "virlog.h"
|
||||||
|
|
||||||
|
# define VIR_FROM_THIS VIR_FROM_NONE
|
||||||
|
|
||||||
static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED)
|
static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED)
|
||||||
{
|
{
|
||||||
@ -188,7 +191,7 @@ mymain(void)
|
|||||||
if (virtTestRun("Test create bad systemd ", 1, testCreateBadSystemd, NULL) < 0)
|
if (virtTestRun("Test create bad systemd ", 1, testCreateBadSystemd, NULL) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
|
|
||||||
#define TEST_SCOPE(name, partition, unitname) \
|
# define TEST_SCOPE(name, partition, unitname) \
|
||||||
do { \
|
do { \
|
||||||
struct testScopeData data = { \
|
struct testScopeData data = { \
|
||||||
name, partition, unitname \
|
name, partition, unitname \
|
||||||
@ -209,3 +212,11 @@ mymain(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virsystemdmock.so")
|
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virsystemdmock.so")
|
||||||
|
|
||||||
|
#else
|
||||||
|
int
|
||||||
|
main(void)
|
||||||
|
{
|
||||||
|
return EXIT_AM_SKIP;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user