From d28010e3f12c8d7e03fa6ef9233b3f1d3ebfaac2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 20 Oct 2009 23:23:31 -0500 Subject: Tests directory. --- tests/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests/Makefile.am (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..82ec364 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,3 @@ + +# Something here + -- cgit v1.2.3 From 5e928c9ce0cbeaa1a1050a7c0e8f10fb7027514c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 20 Oct 2009 23:47:20 -0500 Subject: Now we're building a test, woot! --- tests/Makefile.am | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 82ec364..4044617 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,26 @@ -# Something here +check_PROGRAMS = \ + test-libcustomindicator + +test_libcustomindicator_SOURCES = \ + test-libcustomindicator.c + +test_libcustomindicator_CFLAGS = \ + $(INDICATOR_CFLAGS) \ + -Wall -Werror \ + -I$(top_srcdir)/src + +test_libcustomindicator_LDADD = \ + $(INDICATOR_LIBS) \ + $(top_builddir)/src/libcustomindicator.la + +XML_REPORT = libcustomindicator-check-results.xml +HTML_REPORT = libcustomindicator-check-results.html + +libcustomindicator-tester: test-libcustomindicator + gtester -o=$(XML_REPORT) ./test-libcustomindicator + +check-local: libcustomindicator-tester + +DISTCLEANFILES = $(XML_REPORT) $(HTML_REPORT) -- cgit v1.2.3 From 5e34573c2cff345a2aa3c972ec4a0150f4c4183e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 21 Oct 2009 14:03:18 -0500 Subject: Turning on verbose output and showing the status of all tests. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 4044617..865573b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,7 +18,7 @@ XML_REPORT = libcustomindicator-check-results.xml HTML_REPORT = libcustomindicator-check-results.html libcustomindicator-tester: test-libcustomindicator - gtester -o=$(XML_REPORT) ./test-libcustomindicator + gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator check-local: libcustomindicator-tester -- cgit v1.2.3 From bca9b7ee96632e7c89092184c174b45722e0511c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 22 Oct 2009 09:20:36 -0500 Subject: Adding in two little client server binaries for testing the custom indicator. --- tests/Makefile.am | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 865573b..8327a79 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,12 @@ check_PROGRAMS = \ - test-libcustomindicator + test-libcustomindicator \ + test-libcustomindicator-dbus-client \ + test-libcustomindicator-dbus-server + +######################################### +## test-libcustomindicator +######################################### test_libcustomindicator_SOURCES = \ test-libcustomindicator.c @@ -14,6 +20,44 @@ test_libcustomindicator_LDADD = \ $(INDICATOR_LIBS) \ $(top_builddir)/src/libcustomindicator.la +######################################### +## test-libcustomindicator-dbus-client +######################################### + +test_libcustomindicator_dbus_client_SOURCES = \ + test-defines.h \ + test-libcustomindicator-dbus-client.c + +test_libcustomindicator_dbus_client_CFLAGS = \ + $(INDICATOR_CFLAGS) \ + -Wall -Werror \ + -I$(top_srcdir)/src + +test_libcustomindicator_dbus_client_LDADD = \ + $(INDICATOR_LIBS) \ + $(top_builddir)/src/libcustomindicator.la + +######################################### +## test-libcustomindicator-dbus-server +######################################### + +test_libcustomindicator_dbus_server_SOURCES = \ + test-defines.h \ + test-libcustomindicator-dbus-server.c + +test_libcustomindicator_dbus_server_CFLAGS = \ + $(INDICATOR_CFLAGS) \ + -Wall -Werror \ + -I$(top_srcdir)/src + +test_libcustomindicator_dbus_server_LDADD = \ + $(INDICATOR_LIBS) \ + $(top_builddir)/src/libcustomindicator.la + +######################################### +## Actual tests +######################################### + XML_REPORT = libcustomindicator-check-results.xml HTML_REPORT = libcustomindicator-check-results.html -- cgit v1.2.3 From 23b72422d828dd77909f6cc11947f9fb5e8cee2c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 22 Oct 2009 09:30:59 -0500 Subject: Switching to using a little autotest as well. --- tests/Makefile.am | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 8327a79..f6a0525 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,6 +4,9 @@ check_PROGRAMS = \ test-libcustomindicator-dbus-client \ test-libcustomindicator-dbus-server +TESTS = +DISTCLEANFILES = $(TESTS) + ######################################### ## test-libcustomindicator ######################################### @@ -61,10 +64,21 @@ test_libcustomindicator_dbus_server_LDADD = \ XML_REPORT = libcustomindicator-check-results.xml HTML_REPORT = libcustomindicator-check-results.html -libcustomindicator-tester: test-libcustomindicator - gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator +libcustomindicator-tests: test-libcustomindicator + @echo "#!/bin/sh" > libcustomindicator-tests + @echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> libcustomindicator-tests + @chmod +x libcustomindicator-tests + +TESTS += libcustomindicator-tests +DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) + + +DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf -check-local: libcustomindicator-tester +test-libcustomindicator-dbus: test-libcustomindicator-dbus-client test-libcustomindicator-dbus-server Makefile.am + @echo "#!/bin/sh" > test-libcustomindicator-dbus + @echo $(DBUS_RUNNER) --task ./test-libcustomindicator-dbus-client --task-name Client --task ./test-libcustomindicator-dbus-server --task-name Server --ignore-return >> test-libcustomindicator-dbus + @chmod +x test-libcustomindicator-dbus -DISTCLEANFILES = $(XML_REPORT) $(HTML_REPORT) +TESTS += test-libcustomindicator-dbus -- cgit v1.2.3