diff options
| author | Robert Tari <robert@tari.in> | 2020-12-04 11:22:11 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2020-12-04 11:22:11 +0100 |
| commit | 1f54cb3fc971a8121497819d7bc03b1f6c736963 (patch) | |
| tree | 7bd7033f90db469583e761dfe3b5991e6df3d7fd | |
| parent | 4489b124930e00aaedb020f6b9a38f64535ecdb9 (diff) | |
| parent | 1a62e1e531ae4ebe133964dcf788185fd33f51c9 (diff) | |
| download | libayatana-indicator-1f54cb3fc971a8121497819d7bc03b1f6c736963.tar.gz libayatana-indicator-1f54cb3fc971a8121497819d7bc03b1f6c736963.tar.bz2 libayatana-indicator-1f54cb3fc971a8121497819d7bc03b1f6c736963.zip | |
Merge branch 'sunweaver-pr/fix-test-indicator-ng'
Attributes GH PR #32: https://github.com/AyatanaIndicators/libayatana-indicator/pull/32
| -rw-r--r-- | libayatana-indicator/indicator-ng.c | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/libayatana-indicator/indicator-ng.c b/libayatana-indicator/indicator-ng.c index bd2176e..f4db2e6 100644 --- a/libayatana-indicator/indicator-ng.c +++ b/libayatana-indicator/indicator-ng.c @@ -547,7 +547,10 @@ static void indicator_ng_set_label(IndicatorNg *self, const gchar *label) gtk_css_provider_load_from_data(pCssProvider, sCss, -1, NULL); g_free(sCss); g_object_unref(pCssProvider); - gtk_box_set_spacing(GTK_BOX(pParent), nSpacing); + if (GTK_IS_BOX(pParent)) + { + gtk_box_set_spacing(GTK_BOX(pParent), nSpacing); + } gtk_label_set_label(GTK_LABEL (self->entry.label), sLabel); if (label) diff --git a/tests/Makefile.am b/tests/Makefile.am index 3d7ea3b..87430f6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -499,8 +499,20 @@ test_indicator_ng_LDADD = \ -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) -TESTS += test-indicator-ng -DISTCLEANFILES += test-indicator-ng + +test-indicator-ng-dbus-runner: test-indicator-ng Makefile.am + @echo "#!/bin/sh" > $@ + @echo $(DBUS_RUNNER) --task ./test-indicator-ng >> $@ + @chmod +x $@ + +test-indicator-ng-tester: test-indicator-ng-dbus-runner Makefile.am + @echo "#!/bin/bash" > $@ + @echo $(XVFB_RUN) >> $@ + @echo gtester -k --verbose -o=$(XML_REPORT) ./test-indicator-ng-dbus-runner >> $@ + @chmod +x $@ + +TESTS += test-indicator-ng-tester +DISTCLEANFILES += test-indicator-ng-tester test-indicator-ng-dbus-runner test-indicator-ng # Mock indicator service check_PROGRAMS += indicator-test-service |