Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Change Makefile.am to install regression tests for test package purpose. |
| 2 | |
| 3 | Upstream-Status: Inappropriate [test not install is for purpose from upstream] |
| 4 | |
| 5 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> |
| 6 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> |
| 7 | --- |
| 8 | test/Makefile.am | 3 ++- |
| 9 | test/core/Makefile.am | 3 ++- |
| 10 | test/interfaces/Makefile.am | 3 ++- |
| 11 | 3 files changed, 6 insertions(+), 3 deletions(-) |
| 12 | |
| 13 | diff --git a/test/Makefile.am b/test/Makefile.am |
| 14 | index 379c8c3..6580927 100644 |
| 15 | --- a/test/Makefile.am |
| 16 | +++ b/test/Makefile.am |
| 17 | @@ -48,7 +48,8 @@ TESTS = \ |
| 18 | $(test_scripts) \ |
| 19 | $(NULL) |
| 20 | |
| 21 | -noinst_PROGRAMS = \ |
| 22 | +testdir = $(datadir)/@PACKAGE@/tests |
| 23 | +test_PROGRAMS = \ |
| 24 | $(test_programs) \ |
| 25 | $(test_related_programs) \ |
| 26 | $(NULL) |
| 27 | diff --git a/test/core/Makefile.am b/test/core/Makefile.am |
| 28 | index e4bceb4..54b077d 100644 |
| 29 | --- a/test/core/Makefile.am |
| 30 | +++ b/test/core/Makefile.am |
| 31 | @@ -64,7 +64,8 @@ endif |
| 32 | |
| 33 | ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we |
| 34 | ## build even when not doing "make check" |
| 35 | -noinst_PROGRAMS = \ |
| 36 | +testdir = $(datadir)/@PACKAGE@/tests/core |
| 37 | +test_PROGRAMS = \ |
| 38 | test-dbus-glib \ |
| 39 | test-error-mapping \ |
| 40 | test-service-glib \ |
| 41 | diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am |
| 42 | index a94d08d..707dcac 100644 |
| 43 | --- a/test/interfaces/Makefile.am |
| 44 | +++ b/test/interfaces/Makefile.am |
| 45 | @@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS |
| 46 | |
| 47 | ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we |
| 48 | ## build even when not doing "make check" |
| 49 | -noinst_PROGRAMS = test-service test-client |
| 50 | +testdir = $(datadir)/@PACKAGE@/tests/interfaces |
| 51 | +test_PROGRAMS = test-service test-client |
| 52 | |
| 53 | test_service_SOURCES = \ |
| 54 | test-interfaces.c \ |
| 55 | -- |
| 56 | 1.9.1 |
| 57 | |