diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2012-02-22 14:57:58 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-02-22 14:57:58 +0000 |
| commit | 08a9b7a455e60ff2790335b00ab2000bf6abaa9c (patch) | |
| tree | 58451609c53b2160cbb97090076b4eb38f8c5e8a /test | |
| parent | 4d8fb857dd5ef0ea36368d98b9e7a267322bacb2 (diff) | |
Fix make dist
* configure.ac: Require POSIX tar format for long filenames
* test/Makefile.am: Include isodata/ in dist
* test/test-isodetect.c: Fix VPATH builds
* test/test-mediauris.c: Skip network tests unless LIBOSINFO_NETWORK_TESTS is set
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/test-isodetect.c | 5 | ||||
| -rw-r--r-- | test/test-mediauris.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index afa817d..174b070 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,6 @@ +EXTRA_DIST = isodata + check_PROGRAMS = \ test-entity \ test-device \ @@ -30,7 +32,7 @@ COMMON_CFLAGS = \ $(SOUP_CFLAGS) \ $(SOUP_GNOME_CFLAGS) \ -I$(top_srcdir) \ - -DSRCDIR="\"$(top_srcdir)\"" \ + -DSRCDIR="\"$(abs_top_srcdir)\"" \ $(CHECK_CFLAGS) test_entity_LDADD = $(COMMON_LDADD) diff --git a/test/test-isodetect.c b/test/test-isodetect.c index b342167..93383b1 100644 --- a/test/test-isodetect.c +++ b/test/test-isodetect.c @@ -192,16 +192,13 @@ static GList *load_distros(GFile *dir, GError **error) static GList *load_isos(const gchar *vendor, GError **error) { - gchar *cwd = g_get_current_dir(); - gchar *path = g_strdup_printf("%s/isodata/%s", cwd, vendor); + gchar *path = g_strdup_printf(SRCDIR "/test/isodata/%s", vendor); GList *ret = NULL; GFile *f = g_file_new_for_path(path); - ret = load_distros(f, error); g_object_unref(f); - g_free(cwd); g_free(path); return ret; } diff --git a/test/test-mediauris.c b/test/test-mediauris.c index 0912fb8..c7a6f07 100644 --- a/test/test-mediauris.c +++ b/test/test-mediauris.c @@ -108,6 +108,9 @@ int main(void) Suite *s = list_suite (); SRunner *sr = srunner_create (s); + if (!getenv("LIBOSINFO_NETWORK_TESTS")) + return 77; /* Skip */ + g_type_init(); /* Upfront so we don't confuse valgrind */ |