From 4dbb1a459c281eeb716b4f0ce2fc01e8034c3e20 Mon Sep 17 00:00:00 2001
From: Yao Zhao <yao.zhao@windriver.com>
Date: Tue, 17 Jul 2012 16:46:30 -0400
Subject: [PATCH] Change Makefile.am to install regression tests for test
 package purpose.

Upstream-Status: Inappropriate [test not install is for purpose from upstream]

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 test/Makefile.am            | 3 ++-
 test/core/Makefile.am       | 3 ++-
 test/interfaces/Makefile.am | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 7393bed..1c25d5d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -48,7 +48,8 @@ TESTS = \
 	$(test_scripts) \
 	$(NULL)
 
-noinst_PROGRAMS = \
+testdir = $(datadir)/@PACKAGE@/tests
+test_PROGRAMS = \
 	$(test_programs) \
 	$(test_related_programs) \
 	$(NULL)
diff --git a/test/core/Makefile.am b/test/core/Makefile.am
index 35defa9..295202f 100644
--- a/test/core/Makefile.am
+++ b/test/core/Makefile.am
@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS
 
 ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
 ## build even when not doing "make check"
-noinst_PROGRAMS = \
+testdir = $(datadir)/@PACKAGE@/tests/core
+test_PROGRAMS = \
 	test-dbus-glib \
 	test-error-mapping \
 	test-service-glib \
diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
index f3f62e4..f034b95 100644
--- a/test/interfaces/Makefile.am
+++ b/test/interfaces/Makefile.am
@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS
 
 ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
 ## build even when not doing "make check"
-noinst_PROGRAMS = test-service test-client
+testdir = $(datadir)/@PACKAGE@/tests/interfaces
+test_PROGRAMS = test-service test-client
 
 test_service_SOURCES = \
 	test-interfaces.c \
