From fc573dc11ca279d7a6aaf3c5164fb6e772f8d37c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Oct 2009 11:34:44 -0500 Subject: Creating a new test and linking it into things. --- tests/Makefile.am | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 8121136..fc83186 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,7 @@ check_PROGRAMS = \ - test-loader + test-loader \ + service-shutdown-timeout lib_LTLIBRARIES = \ libdummy-indicator-blank.la \ @@ -76,6 +77,21 @@ libdummy_indicator_simple_la_LDFLAGS = \ -module \ -avoid-version +############################# +# Service Shutdown Timeout +############################# + +service_shutdown_timeout_SOURCES = \ + service-shutdown-timeout.c + +service_shutdown_timeout_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_shutdown_timeout_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + ############################# # Test stuff ############################# -- cgit v1.2.3 From a72fc583b5ae76ee0d4183ae72e4d905c0304bb7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Oct 2009 12:57:56 -0500 Subject: Making the gtester stuff into a autotest thingy. --- tests/Makefile.am | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index fc83186..bacdce6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,5 @@ +TESTS = +DISTCLEANFILES = check_PROGRAMS = \ test-loader \ @@ -99,10 +101,13 @@ service_shutdown_timeout_LDADD = \ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html -loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la - @gtester -k --verbose -o=$(XML_REPORT) ./test-loader +loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la Makefile + @echo "#!/bin/sh" > loader-tester + @echo gtester -k --verbose -o=$(XML_REPORT) ./test-loader >> loader-tester + @chmod +x loader-tester -check-local: loader-tester +TESTS += loader-tester +DISTCLEANFILES += loader-tester -DISTCLEANFILES = $(XML_REPORT) $(HTML_REPORT) +DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) -- cgit v1.2.3 From 22a5b08a9ddb76888f580141617d67a319fbfad9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Oct 2009 13:03:39 -0500 Subject: Woot! A failing test. Look how TDD I am. --- tests/Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index bacdce6..485d02e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,6 +10,8 @@ lib_LTLIBRARIES = \ libdummy-indicator-null.la \ libdummy-indicator-simple.la +DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf + ############################# # Test Loader ############################# @@ -94,6 +96,14 @@ service_shutdown_timeout_LDADD = \ $(LIBINDICATOR_LIBS) \ $(top_builddir)/libindicator/.libs/libindicator.a +service-shutdown-timeout-tester: service-shutdown-timeout Makefile + @echo "#!/bin/sh" > service-shutdown-timeout-tester + @echo $(DBUS_RUNNER) --task ./service-shutdown-timeout >> service-shutdown-timeout-tester + @chmod +x service-shutdown-timeout-tester + +TESTS += service-shutdown-timeout-tester +DISTCLEANFILES += service-shutdown-timeout-tester + ############################# # Test stuff ############################# -- cgit v1.2.3 From 911b9d7f93b4319665b5fa63b84032df230412ba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 30 Oct 2009 17:18:10 -0500 Subject: Adding a test that ensures we don't get a connect signal. --- tests/Makefile.am | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 485d02e..dd047d3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,6 +3,7 @@ DISTCLEANFILES = check_PROGRAMS = \ test-loader \ + service-manager-no-connect \ service-shutdown-timeout lib_LTLIBRARIES = \ @@ -104,6 +105,29 @@ service-shutdown-timeout-tester: service-shutdown-timeout Makefile TESTS += service-shutdown-timeout-tester DISTCLEANFILES += service-shutdown-timeout-tester +############################# +# Service Manager No Connect +############################# + +service_manager_no_connect_SOURCES = \ + service-manager-no-connect.c + +service_manager_no_connect_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_manager_no_connect_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +service-manager-no-connect-tester: service-manager-no-connect Makefile + @echo "#!/bin/sh" > service-manager-no-connect-tester + @echo $(DBUS_RUNNER) --task ./service-manager-no-connect >> service-manager-no-connect-tester + @chmod +x service-manager-no-connect-tester + +TESTS += service-manager-no-connect-tester +DISTCLEANFILES += service-manager-no-connect-tester + ############################# # Test stuff ############################# -- cgit v1.2.3 From 9a15eec1f5fc9609b877a411564abbf600a22ee5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 11:17:10 -0600 Subject: Adding in the basic data needed to start bringing up a test to start the service. --- tests/Makefile.am | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index dd047d3..744c807 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,6 +4,8 @@ DISTCLEANFILES = check_PROGRAMS = \ test-loader \ service-manager-no-connect \ + service-manager-connect \ + service-manager-connect-service \ service-shutdown-timeout lib_LTLIBRARIES = \ @@ -120,7 +122,7 @@ service_manager_no_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ $(top_builddir)/libindicator/.libs/libindicator.a -service-manager-no-connect-tester: service-manager-no-connect Makefile +service-manager-no-connect-tester: service-manager-no-connect Makefile.am @echo "#!/bin/sh" > service-manager-no-connect-tester @echo $(DBUS_RUNNER) --task ./service-manager-no-connect >> service-manager-no-connect-tester @chmod +x service-manager-no-connect-tester @@ -128,6 +130,43 @@ service-manager-no-connect-tester: service-manager-no-connect Makefile TESTS += service-manager-no-connect-tester DISTCLEANFILES += service-manager-no-connect-tester +############################# +# Service Manager Connect +############################# + +session.conf: session.conf.in Makefile.am + sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@ + +service_manager_connect_SOURCES = \ + service-manager-connect.c + +service_manager_connect_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_manager_connect_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +service_manager_connect_service_SOURCES = \ + service-manager-connect-service.c + +service_manager_connect_service_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_manager_connect_service_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf Makefile.am + @echo "#!/bin/sh" > service-manager-connect-tester + @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-manager-connect >> service-manager-connect-tester + @chmod +x service-manager-connect-tester + +TESTS += service-manager-connect-tester +DISTCLEANFILES += service-manager-connect-tester + ############################# # Test stuff ############################# -- cgit v1.2.3 From dc5fbef86dc82fbc1d768dba489fe4ba0b09adfc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 11:21:20 -0600 Subject: Building a service file. --- tests/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 744c807..3703259 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -137,6 +137,9 @@ DISTCLEANFILES += service-manager-no-connect-tester session.conf: session.conf.in Makefile.am sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@ +service-manager-connect.service: service-manager-connect.service.in Makefile.am + sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@ + service_manager_connect_SOURCES = \ service-manager-connect.c @@ -159,7 +162,7 @@ service_manager_connect_service_LDADD = \ $(LIBINDICATOR_LIBS) \ $(top_builddir)/libindicator/.libs/libindicator.a -service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf Makefile.am +service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf service-manager-connect.service Makefile.am @echo "#!/bin/sh" > service-manager-connect-tester @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-manager-connect >> service-manager-connect-tester @chmod +x service-manager-connect-tester -- cgit v1.2.3 From 5ccc73bea6b75cc3a027f831bb60bfcf43714deb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 16:17:31 -0600 Subject: Distcheck fixes. Looking for the files in the right place and making sure we clean up after ourselves. --- tests/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 3703259..7c306bc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -134,10 +134,10 @@ DISTCLEANFILES += service-manager-no-connect-tester # Service Manager Connect ############################# -session.conf: session.conf.in Makefile.am +session.conf: $(srcdir)/session.conf.in Makefile.am sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@ -service-manager-connect.service: service-manager-connect.service.in Makefile.am +service-manager-connect.service: $(srcdir)/service-manager-connect.service.in Makefile.am sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@ service_manager_connect_SOURCES = \ @@ -168,7 +168,7 @@ service-manager-connect-tester: service-manager-connect service-manager-connect- @chmod +x service-manager-connect-tester TESTS += service-manager-connect-tester -DISTCLEANFILES += service-manager-connect-tester +DISTCLEANFILES += service-manager-connect-tester session.conf service-manager-connect.service ############################# # Test stuff -- cgit v1.2.3