mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
avoid many mingw-specific warnings
* tests/virshtest.c (mymain): Use only one definition of this function. [WIN32]: Call exit(77) to skip the test. * tests/nodeinfotest.c: Likewise.
This commit is contained in:
@@ -15,8 +15,6 @@ static char *abs_srcdir;
|
||||
|
||||
#define MAX_FILE 4096
|
||||
|
||||
#ifdef __linux__
|
||||
|
||||
extern int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo);
|
||||
|
||||
static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) {
|
||||
@@ -64,14 +62,12 @@ static int linuxTestNodeInfo(const void *data) {
|
||||
abs_srcdir, (const char*)data);
|
||||
return linuxTestCompareFiles(cpuinfo, output);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static int
|
||||
mymain(int argc, char **argv)
|
||||
{
|
||||
int ret = 0;
|
||||
#ifdef __linux__
|
||||
int i;
|
||||
const char *nodeData[] = {
|
||||
"nodeinfo-1",
|
||||
@@ -82,6 +78,9 @@ mymain(int argc, char **argv)
|
||||
"nodeinfo-6",
|
||||
};
|
||||
char cwd[PATH_MAX];
|
||||
#ifndef __linux__
|
||||
exit (77); /* means 'test skipped' for automake */
|
||||
#endif
|
||||
|
||||
abs_srcdir = getenv("abs_srcdir");
|
||||
if (!abs_srcdir)
|
||||
@@ -99,7 +98,6 @@ mymain(int argc, char **argv)
|
||||
for (i = 0 ; i < ARRAY_CARDINALITY(nodeData); i++)
|
||||
if (virtTestRun(nodeData[i], 1, linuxTestNodeInfo, nodeData[i]) != 0)
|
||||
ret = -1;
|
||||
#endif
|
||||
|
||||
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user