Arrange for tests to pass in a non-srcdir build.

* tests/Makefile.am: Include the contents of the *data directories
in the make-dist-built tarball by adding each of that *data
directories to EXTRA_DIST.
Also add int-overflow (via $(test_scripts)) to EXTRA_DIST.
* tests/nodeinfotest.c: Prepend "$abs_top_srcdir/tests" to
each input file name.
* tests/qemuxml2argvtest.c: Likewise.
* tests/qemuxml2xmltest.c: Likewise.
* tests/sexpr2xmltest.c: Likewise.
* tests/test_conf.sh: Likewise.
* tests/virshtest.c: Likewise.
* tests/xencapstest.c: Likewise.
* tests/xmconfigtest.c: Likewise.
* tests/xml2sexprtest.c: Likewise.


Author: Jim Meyering <meyering@redhat.com>
This commit is contained in:
Jim Meyering
2007-11-14 10:35:58 +00:00
parent 4f2900d097
commit 5a6571eba9
11 changed files with 135 additions and 21 deletions

View File

@@ -13,13 +13,14 @@
#include "xen_internal.h"
static char *progname;
static char *abs_top_srcdir;
#define MAX_FILE 4096
static int testCompareFiles(const char *hostmachine,
const char *xml,
const char *cpuinfo,
const char *capabilities) {
const char *xml_rel,
const char *cpuinfo_rel,
const char *capabilities_rel) {
char xmlData[MAX_FILE];
char *expectxml = &(xmlData[0]);
char *actualxml = NULL;
@@ -27,6 +28,17 @@ static int testCompareFiles(const char *hostmachine,
int ret = -1;
char xml[PATH_MAX];
char cpuinfo[PATH_MAX];
char capabilities[PATH_MAX];
snprintf(xml, sizeof xml - 1, "%s/tests/%s",
abs_top_srcdir, xml_rel);
snprintf(cpuinfo, sizeof cpuinfo - 1, "%s/tests/%s",
abs_top_srcdir, cpuinfo_rel);
snprintf(capabilities, sizeof capabilities - 1, "%s/tests/%s",
abs_top_srcdir, capabilities_rel);
if (virtTestLoadFile(xml, &expectxml, MAX_FILE) < 0)
goto fail;
@@ -152,6 +164,10 @@ main(int argc, char **argv)
exit(EXIT_FAILURE);
}
abs_top_srcdir = getenv("abs_top_srcdir");
if (!abs_top_srcdir)
return 1;
virInitialize();
if (virtTestRun("Capabilities for i686, no PAE, no HVM",