Merge lp:~dobey/unity-scope-click/check-run-tests into lp:unity-scope-click

[dobey]

Run the tests during make check.
Rename click-scope-tests to more standard test-scope-click.
Move click-scope-tests to a noinst program to avoid installation to system.

[Alejandro J. Cura (alecu)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/107/rebuild

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

+1

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2013-07-19 16:09:57 +0000
+++ debian/rules	2013-12-04 14:50:24 +0000
@@ -11,5 +11,4 @@
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_install:
-	rm -f debian/*/usr/lib/*/*/click-scope-tests
 	dh_install --fail-missing

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-10-07 15:32:27 +0000
+++ src/Makefile.am	2013-12-04 14:50:24 +0000
@@ -13,8 +13,10 @@
 AM_LDFLAGS = $(COVERAGE_LDFLAGS) -R $(PROTOCOLPRIVATELIBDIR)
 
 pkglibexec_PROGRAMS = \
-  click-scope \
-  click-scope-tests
+  click-scope
+
+noinst_PROGRAMS = \
+	test-click-scope
 
 click_scope_CPPFLAGS = \
   -DDATADIR=\"$(DATADIR)\" \
@@ -61,7 +63,7 @@
   $(click_scope_VALASOURCES:.vala=.c) \
   $(NULL)
 
-click_scope_tests_CPPFLAGS = \
+test_click_scope_CPPFLAGS = \
   -DDATADIR=\"$(DATADIR)\" \
   -DPKGDATADIR=\"$(PKGDATADIR)\" \
   -DG_LOG_DOMAIN=\"unity-scope-click\" \
@@ -70,7 +72,7 @@
   -I$(srcdir) \
   -g
 
-click_scope_tests_VALAFLAGS = \
+test_click_scope_VALAFLAGS = \
   -C \
   --save-temps \
   --pkg unity \
@@ -86,11 +88,11 @@
   $(srcdir)/assertions.vapi \
   $(MAINTAINER_VALAFLAGS)
 
-click_scope_tests_LDADD = \
+test_click_scope_LDADD = \
   $(SCOPE_DAEMON_LIBS) \
   $(NULL)
 
-click_scope_tests_VALASOURCES = \
+test_click_scope_VALASOURCES = \
   test-click-webservice.vala \
   click-webservice.vala \
   fake-data.vala \
@@ -99,18 +101,18 @@
   ubuntuone-credentials.vala \
   $(NULL)
 
-click_scope_tests_SOURCES = \
-  $(click_scope_tests_VALASOURCES:.vala=.c) \
+test_click_scope_SOURCES = \
+  $(test_click_scope_VALASOURCES:.vala=.c) \
   $(NULL)
 
 BUILT_SOURCES += \
   click_scope.vala.stamp \
-  click_scope_tests.vala.stamp
+  test_click_scope.vala.stamp
 
 EXTRA_DIST += \
   click_scope.vala.stamp \
   $(click_scope_VALASOURCES) \
-  $(click_scope_tests_VALASOURCES) \
+  $(test_click_scope_VALASOURCES) \
   tdb.vapi \
   tdb.deps \
   $(NULL)
@@ -119,12 +121,17 @@
 	$(AM_V_GEN) $(VALAC) $(click_scope_VALAFLAGS) $^
 	touch click_scope.vala.stamp
 
-click_scope_tests.vala.stamp: $(click_scope_tests_VALASOURCES)
-	$(AM_V_GEN) $(VALAC) $(click_scope_tests_VALAFLAGS) $^
-	touch click_scope_tests.vala.stamp
+test_click_scope.vala.stamp: $(test_click_scope_VALASOURCES)
+	$(AM_V_GEN) $(VALAC) $(test_click_scope_VALAFLAGS) $^
+	touch test_click_scope.vala.stamp
+
+check-local: $(noinst_PROGRAMS)
+	for program in $(noinst_PROGRAMS); do \
+		$(builddir)/$$program; \
+	done
 
 CLEANFILES += \
   *.stamp \
   $(click_scope_VALASOURCES:.vala=.c) \
-  $(click_scope_tests_VALASOURCES:.vala=.c) \
+  $(test_click_scope_VALASOURCES:.vala=.c) \
   $(NULL)