aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--debian/changelog3
-rw-r--r--tests/Makefile.am9
3 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 8fb5d77..a406d44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,4 +40,6 @@ dist-hook:
echo Failed to generate AUTHORS: not a branch >&2; \
fi
+localcheck:
+
include $(top_srcdir)/Makefile.am.coverage
diff --git a/debian/changelog b/debian/changelog
index 060d8a7..d4a6e10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ indicator-session (12.10.5-0ubuntu1) UNRELEASED; urgency=low
- Hide 'start screen saver' action, if it's locked down. (LP: #1066825)
- Use the same icons in the greeter as in the user session (LP: #1049244)
- Test upower_proxy for NULL before using it. (LP: #1061844)
+ * Move TestCanStartService into a separate make target "localcheck"; so that
+ the other tests can successfully run, and this one be used as an
+ integration check.
[ Sebastien Bacher ]
* debian/control:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 088b283..9f9f961 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,9 @@ CLEANFILES =
BUILT_SOURCES =
check_PROGRAMS =
+localcheckdir = .
+localcheck_PROGRAMS =
+
###
###
###
@@ -29,8 +32,10 @@ gschemas.compiled: Makefile
$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
-TESTS += test-service
-check_PROGRAMS += test-service
+localcheck:
+ ./test-service
+
+localcheck_PROGRAMS += test-service
test_service_SOURCES = test-service.cc
test_service_LDADD = \
$(TEST_SERVICE_LIBS) \