From fa946df247f0e16de3a355dd5696f4671277348a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 12:18:23 -0400 Subject: Adding in a tests folder --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) 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..8ac6544 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1 @@ +#Something should go here -- cgit v1.2.3 From c314d6040b93da70359e19a8b7475c94fc86fb1c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 12:29:12 -0400 Subject: Adding in a simple little test. --- 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 8ac6544..a04855c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1 +1,24 @@ -#Something should go here + +noinst_PROGRAMS = \ + test-loader + +test_loader_SOURCES = \ + test-loader.c + +test_loader_CFLAGS = \ + -Wall -Werror \ + $(UPANEL_CFLAGS) -I$(top_srcdir) + +test_loader_LDADD = \ + $(UPANEL_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a + +XML_REPORT = loader-check-results.xml +HTML_REPORT = loader-check-results.html + +loader-tester: test-loader + @gtester -o=$(XML_REPORT) ./test-loader + +check-local: loader-tester + +DISTCLEANFILES = $(XML_REPORT) $(HTML_REPORT) + -- cgit v1.2.3 From 1386478a87fd0f228dd31a00d8f3d969d6a6a98c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 13:00:00 -0400 Subject: Fleshing out the test a little bit. --- 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 a04855c..2779ad7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -noinst_PROGRAMS = \ +check_PROGRAMS = \ test-loader test_loader_SOURCES = \ @@ -7,10 +7,10 @@ test_loader_SOURCES = \ test_loader_CFLAGS = \ -Wall -Werror \ - $(UPANEL_CFLAGS) -I$(top_srcdir) + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) test_loader_LDADD = \ - $(UPANEL_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a + $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html -- cgit v1.2.3 From c594126850cb7b59294069f2711fa0a5d96febbb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:03:20 -0400 Subject: Creating a dummy indicator that returns null --- tests/Makefile.am | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 2779ad7..ad5e5c6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,13 @@ check_PROGRAMS = \ test-loader +check_LTLIBRARIES = \ + libdummy-indicator-null.la + +############################# +# Test Loader +############################# + test_loader_SOURCES = \ test-loader.c @@ -12,10 +19,32 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a +############################# +# Dummy Indicator +############################# + +libdummy_indicator_null_la_SOURCES = \ + dummy-indicator-null.c + +libdummy_indicator_null_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_null_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_null_la_LDFLAGS = \ + -module \ + -avoid-version + +############################# +# Test stuff +############################# + XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html -loader-tester: test-loader +loader-tester: test-loader libdummy-indicator-null.la @gtester -o=$(XML_REPORT) ./test-loader check-local: loader-tester -- cgit v1.2.3 From 1b828c9f669ce1364618387d13fc8a134244e2ba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:53:01 -0400 Subject: Apparently they have to be installable to get the .so. Fail. --- 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 ad5e5c6..52cc224 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ check_PROGRAMS = \ test-loader -check_LTLIBRARIES = \ +lib_LTLIBRARIES = \ libdummy-indicator-null.la ############################# -- cgit v1.2.3 From 376658695b00a0d272b9463722a9d7914a7d7ffc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 18:48:59 -0400 Subject: Build dir fix and making gtester run all of them even if one fails. --- tests/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 52cc224..2048a9a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,7 +14,8 @@ test_loader_SOURCES = \ test_loader_CFLAGS = \ -Wall -Werror \ - $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -DBUILD_DIR="\"$(builddir)\"" test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a @@ -45,7 +46,7 @@ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html loader-tester: test-loader libdummy-indicator-null.la - @gtester -o=$(XML_REPORT) ./test-loader + @gtester -k -o=$(XML_REPORT) ./test-loader check-local: loader-tester -- cgit v1.2.3 From a28e917b914b07de67027c97eb29d533e3fe9393 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:50:40 -0400 Subject: Being a bit more verbose --- 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 2048a9a..461bb51 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,7 +46,7 @@ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html loader-tester: test-loader libdummy-indicator-null.la - @gtester -k -o=$(XML_REPORT) ./test-loader + @gtester -k --verbose -o=$(XML_REPORT) ./test-loader check-local: loader-tester -- cgit v1.2.3 From 97a4004d26cd5ebec0b25b51d4793d1df51b5dba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:12:48 -0400 Subject: Create a very simple indicator and testing it. --- tests/Makefile.am | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 461bb51..c21ff09 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,7 +3,8 @@ check_PROGRAMS = \ test-loader lib_LTLIBRARIES = \ - libdummy-indicator-null.la + libdummy-indicator-null.la \ + libdummy-indicator-simple.la ############################# # Test Loader @@ -21,7 +22,7 @@ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a ############################# -# Dummy Indicator +# Dummy Indicator NULL ############################# libdummy_indicator_null_la_SOURCES = \ @@ -38,6 +39,24 @@ libdummy_indicator_null_la_LDFLAGS = \ -module \ -avoid-version +############################# +# Dummy Indicator Simple +############################# + +libdummy_indicator_simple_la_SOURCES = \ + dummy-indicator-simple.c + +libdummy_indicator_simple_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_simple_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_simple_la_LDFLAGS = \ + -module \ + -avoid-version + ############################# # Test stuff ############################# @@ -45,7 +64,7 @@ libdummy_indicator_null_la_LDFLAGS = \ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html -loader-tester: test-loader libdummy-indicator-null.la +loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la @gtester -k --verbose -o=$(XML_REPORT) ./test-loader check-local: loader-tester -- cgit v1.2.3 From a2f4f868e8744fd6aea1ffb0b335e70c54e039ea Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 11 Oct 2009 21:49:22 -0500 Subject: Building a new dummy indicator that doesn't have any symbols in it. --- tests/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index c21ff09..8121136 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,6 +3,7 @@ check_PROGRAMS = \ test-loader lib_LTLIBRARIES = \ + libdummy-indicator-blank.la \ libdummy-indicator-null.la \ libdummy-indicator-simple.la @@ -21,6 +22,24 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a +############################# +# Dummy Indicator Blank +############################# + +libdummy_indicator_blank_la_SOURCES = \ + dummy-indicator-blank.c + +libdummy_indicator_blank_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_blank_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_blank_la_LDFLAGS = \ + -module \ + -avoid-version + ############################# # Dummy Indicator NULL ############################# -- cgit v1.2.3