DBus Menu

Merge lp:~cyphermox/libdbusmenu/gtkdoc-checks into lp:libdbusmenu/13.10

  1. gtkdoc-checks
  2. Merge into trunk.13.10
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 446
Merged at revision: 446
Proposed branch: lp:~cyphermox/libdbusmenu/gtkdoc-checks
Merge into: lp:libdbusmenu/13.10
Diff against target: 68 lines (+18/-6)
3 files modified
docs/libdbusmenu-glib/reference/Makefile.am (+0/-3)
docs/libdbusmenu-gtk/reference/Makefile.am (+0/-3)
tests/Makefile.am (+18/-0)
To merge this branch: bzr merge lp:~cyphermox/libdbusmenu/gtkdoc-checks
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+167390@code.launchpad.net

Commit message

Fix gtkdoc-check tests, and move them to tests subdirectory.

Description of the change

Fix gtkdoc-check tests, and move them to tests subdirectory.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

build fine here :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/27

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbusmenu-ci/27/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libdbusmenu-ci/5/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/libdbusmenu-glib/reference/Makefile.am'
2--- docs/libdbusmenu-glib/reference/Makefile.am 2013-01-21 16:04:47 +0000
3+++ docs/libdbusmenu-glib/reference/Makefile.am 2013-06-04 20:11:34 +0000
4@@ -89,11 +89,8 @@
5 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
6 #DISTCLEANFILES +=
7
8-# Comment this out if you want 'make check' to test you doc status
9-# and run some sanity checks
10 if ENABLE_GTK_DOC
11 TESTS_ENVIRONMENT = cd $(srcdir) && \
12 DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
13 SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
14-TESTS = $(GTKDOC_CHECK)
15 endif
16
17=== modified file 'docs/libdbusmenu-gtk/reference/Makefile.am'
18--- docs/libdbusmenu-gtk/reference/Makefile.am 2013-01-21 16:04:47 +0000
19+++ docs/libdbusmenu-gtk/reference/Makefile.am 2013-06-04 20:11:34 +0000
20@@ -89,12 +89,9 @@
21 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
22 #DISTCLEANFILES +=
23
24-# Comment this out if you want 'make check' to test you doc status
25-# and run some sanity checks
26 if ENABLE_GTK_DOC
27 TESTS_ENVIRONMENT = cd $(srcdir) && \
28 DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
29 SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
30-TESTS = $(GTKDOC_CHECK)
31 endif
32
33
34=== modified file 'tests/Makefile.am'
35--- tests/Makefile.am 2012-09-19 23:55:27 +0000
36+++ tests/Makefile.am 2013-06-04 20:11:34 +0000
37@@ -35,6 +35,12 @@
38 # test-gtk-submenu
39 endif
40
41+if ENABLE_GTK_DOC
42+TESTS += \
43+ test_libdbusmenu_glib_gtkdoc \
44+ test_libdbusmenu_gtk_gtkdoc
45+endif
46+
47 # The Python test only work on the system copy of
48 # dbusmenu, so while they can be usefule they're not
49 # good tests of what you're currently building. Handy
50@@ -710,6 +716,18 @@
51 # Other
52 #########################
53
54+test_libdbusmenu_glib_gtkdoc:
55+ @echo "#!/bin/bash" > $@
56+ @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@
57+ @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@
58+ @chmod +x $@
59+
60+test_libdbusmenu_gtk_gtkdoc:
61+ @echo "#!/bin/bash" > $@
62+ @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@
63+ @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@
64+ @chmod +x $@
65+
66 examplesdir = $(docdir)/examples/
67
68 examples_DATA = \

Subscribers

People subscribed via source and target branches