diff options
author | Eric Blake <eblake@redhat.com> | 2011-04-29 10:21:20 -0600 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2011-04-29 10:21:20 -0600 |
commit | 20986e58aa2ecfc96ae6807b2d43f389153417ac (patch) | |
tree | 3f15e3d4e73877c4f4ac576010589459d1756ecc /tests/nodeinfotest.c | |
parent | build: avoid test warnings on mingw (diff) | |
download | libvirt-20986e58aa2ecfc96ae6807b2d43f389153417ac.tar.gz libvirt-20986e58aa2ecfc96ae6807b2d43f389153417ac.tar.bz2 libvirt-20986e58aa2ecfc96ae6807b2d43f389153417ac.zip |
tests: simplify common setup
A few of the tests were missing basic sanity checks, while most
of them were doing copy-and-paste initialization (in fact, some
of them pasted the argc > 1 check more than once!). It's much
nicer to do things in one common place, and minimizes the size of
the next patch that fixes getcwd usage.
* tests/testutils.h (EXIT_AM_HARDFAIL): New define.
(progname, abs_srcdir): Define for all tests.
(VIRT_TEST_MAIN): Change callback signature.
* tests/testutils.c (virtTestMain): Do more common init.
* tests/commandtest.c (mymain): Simplify.
* tests/cputest.c (mymain): Likewise.
* tests/esxutilstest.c (mymain): Likewise.
* tests/eventtest.c (mymain): Likewise.
* tests/hashtest.c (mymain): Likewise.
* tests/networkxml2xmltest.c (mymain): Likewise.
* tests/nodedevxml2xmltest.c (myname): Likewise.
* tests/nodeinfotest.c (mymain): Likewise.
* tests/nwfilterxml2xmltest.c (mymain): Likewise.
* tests/qemuargv2xmltest.c (mymain): Likewise.
* tests/qemuhelptest.c (mymain): Likewise.
* tests/qemuxml2argvtest.c (mymain): Likewise.
* tests/qemuxml2xmltest.c (mymain): Likewise.
* tests/qparamtest.c (mymain): Likewise.
* tests/sexpr2xmltest.c (mymain): Likewise.
* tests/sockettest.c (mymain): Likewise.
* tests/statstest.c (mymain): Likewise.
* tests/storagepoolxml2xmltest.c (mymain): Likewise.
* tests/storagevolxml2xmltest.c (mymain): Likewise.
* tests/virbuftest.c (mymain): Likewise.
* tests/virshtest.c (mymain): Likewise.
* tests/vmx2xmltest.c (mymain): Likewise.
* tests/xencapstest.c (mymain): Likewise.
* tests/xmconfigtest.c (mymain): Likewise.
* tests/xml2sexprtest.c (mymain): Likewise.
* tests/xml2vmxtest.c (mymain): Likewise.
Diffstat (limited to 'tests/nodeinfotest.c')
-rw-r--r-- | tests/nodeinfotest.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index c69040350..9a87dc09c 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -21,9 +21,6 @@ mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) #else -static char *progname; -static char *abs_srcdir; - # define MAX_FILE 4096 extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo, @@ -89,7 +86,7 @@ static int linuxTestNodeInfo(const void *data) { static int -mymain(int argc, char **argv) +mymain(void) { int ret = 0; int i; @@ -101,18 +98,6 @@ mymain(int argc, char **argv) "nodeinfo-5", "nodeinfo-6", }; - char cwd[PATH_MAX]; - - abs_srcdir = getenv("abs_srcdir"); - if (!abs_srcdir) - abs_srcdir = getcwd(cwd, sizeof(cwd)); - - progname = argv[0]; - - if (argc > 1) { - fprintf(stderr, "Usage: %s\n", progname); - return(EXIT_FAILURE); - } if (virInitialize() < 0) return EXIT_FAILURE; |