diff options
| author | Juan A. Suarez Romero <jasuarez@igalia.com> | 2013-06-22 01:33:54 +0000 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2013-06-22 01:33:54 +0000 |
| commit | 221e99a4c8514121c491b95990dcaaa860f5365e (patch) | |
| tree | 02bc95dc6cdd20c4e260b25f51c5b4c209869093 /tests/local-metadata | |
| parent | 2f30ba15e34ea613deb74cec1bc8b6d72e343c48 (diff) | |
tests: Refactor local-metadata tests
Diffstat (limited to 'tests/local-metadata')
| -rw-r--r-- | tests/local-metadata/Makefile.am | 27 | ||||
| -rw-r--r-- | tests/local-metadata/test_local_metadata.c | 2 |
2 files changed, 13 insertions, 16 deletions
diff --git a/tests/local-metadata/Makefile.am b/tests/local-metadata/Makefile.am index 2d5a3ab..620cc97 100644 --- a/tests/local-metadata/Makefile.am +++ b/tests/local-metadata/Makefile.am @@ -5,35 +5,30 @@ # # Copyright (C) 2010-2013 Igalia S.L. -INCLUDES = @DEPS_CFLAGS@ +include $(top_srcdir)/gtester.mk -TESTS = \ +TEST_PROGS += \ test_local_metadata -check_PROGRAMS = $(TESTS) - # Let the .c source code know about these paths, # even when sourcedir!=builddir, such as during make distcheck: # # We could set GRL_PLUGIN_PATH here in TESTS_ENVIRONMENT, specifying all the paths (separated by :) to all the plugins, # but it is cleaner to restrict the test to just one plugin by doing it in the code. -test_local_metadata_defines = \ - -DGRILO_PLUGINS_TESTS_LOCAL_METADATA_PLUGIN_PATH=\""$(abs_top_builddir)/src/local-metadata/.libs/"\" - -test_local_metadata_SOURCES = \ - test_local_metadata.c +test_local_metadata_CFLAGS = \ + -DTESTS_PLUGIN_PATH=\""$(abs_top_builddir)/src/local-metadata/.libs/"\" \ + -DPREFIX=$(prefix) \ + @GTHREAD_CFLAGS@ \ + @DEPS_CFLAGS@ \ + @GIO_CFLAGS@ -test_local_metadata_LDADD = \ +test_local_metadata_LDADD = \ @DEPS_LIBS@ \ @GTHREAD_LIBS@ \ @GIO_LIBS@ -test_local_metadata_CFLAGS = \ - -DPREFIX=$(prefix) \ - $(test_local_metadata_defines) \ - @GTHREAD_CFLAGS@ \ - @GIO_CFLAGS@ +test_local_metadata_SOURCES = test_local_metadata.c # Distribute the tests data: dist_noinst_DATA = \ @@ -41,6 +36,8 @@ dist_noinst_DATA = \ data/image2.png \ data/thumbnail.png +noinst_PROGRAMS = $(TEST_PROGS) + MAINTAINERCLEANFILES = \ *.in \ *~ diff --git a/tests/local-metadata/test_local_metadata.c b/tests/local-metadata/test_local_metadata.c index a6fe9d2..159e8ff 100644 --- a/tests/local-metadata/test_local_metadata.c +++ b/tests/local-metadata/test_local_metadata.c @@ -299,7 +299,7 @@ finish: int main(int argc, char **argv) { - g_setenv ("GRL_PLUGIN_PATH", GRILO_PLUGINS_TESTS_LOCAL_METADATA_PLUGIN_PATH, TRUE); + g_setenv ("GRL_PLUGIN_PATH", TESTS_PLUGIN_PATH, TRUE); g_setenv ("GRL_PLUGIN_LIST", LOCAL_SOURCE_ID, TRUE); grl_init (&argc, &argv); |