From d2d70f2aeb370b0827e8c66fa9e7e2a26b1d6648 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Tue, 9 Jul 2013 00:06:24 +0200 Subject: [PATCH] tests: Move config-parser.test to tests/ Signed-off-by: Quentin Glidic --- shared/Makefile.am | 11 ----------- tests/.gitignore | 1 + tests/Makefile.am | 12 +++++++++++- {shared => tests}/config-parser-test.c | 0 4 files changed, 12 insertions(+), 12 deletions(-) rename {shared => tests}/config-parser-test.c (100%) diff --git a/shared/Makefile.am b/shared/Makefile.am index edef416e8..2fcff7bb8 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -30,14 +30,3 @@ libshared_cairo_la_SOURCES = \ image-loader.h \ cairo-util.c \ cairo-util.h - -TESTS = config-parser-test - -check_PROGRAMS = $(TESTS) - -config_parser_test_LDADD = $(COMPOSITOR_LIBS) -config_parser_test_CFLAGS = $(COMPOSITOR_CFLAGS) -config_parser_test_SOURCES = \ - config-parser.c \ - config-parser.h \ - config-parser-test.c diff --git a/tests/.gitignore b/tests/.gitignore index ad112408d..28d657633 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,3 +1,4 @@ +*.test *.weston logs matrix-test diff --git a/tests/Makefile.am b/tests/Makefile.am index a4e5a287d..d4aa9098f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,7 @@ -TESTS = $(module_tests) $(weston_tests) +TESTS = $(shared_tests) $(module_tests) $(weston_tests) + +shared_tests = \ + config-parser.test module_tests = \ surface-test.la \ @@ -36,6 +39,7 @@ check_LTLIBRARIES = \ $(module_tests) check_PROGRAMS = \ + $(shared_tests) \ $(weston_tests) AM_CFLAGS = $(GCC_CFLAGS) @@ -47,6 +51,12 @@ AM_CPPFLAGS = \ $(COMPOSITOR_CFLAGS) AM_LDFLAGS = -module -avoid-version -rpath $(libdir) +config_parser_test_LDADD = \ + ../shared/libshared.la \ + $(COMPOSITOR_LIBS) +config_parser_test_SOURCES = \ + config-parser-test.c + surface_global_test_la_SOURCES = surface-global-test.c surface_test_la_SOURCES = surface-test.c diff --git a/shared/config-parser-test.c b/tests/config-parser-test.c similarity index 100% rename from shared/config-parser-test.c rename to tests/config-parser-test.c