Merge lp:~thekorn/zeitgeist/fix-628661-make-check-doc into lp:zeitgeist/0.1

Proposed by Markus Korn on 2010-09-02
Status: Merged
Merged at revision: 1566
Proposed branch: lp:~thekorn/zeitgeist/fix-628661-make-check-doc
Merge into: lp:zeitgeist/0.1
Diff against target: 64 lines (+32/-2)
4 files modified
Makefile.am (+17/-0)
doc/Makefile.am (+3/-0)
po/POTFILES.skip (+1/-0)
test/run-all-tests.py (+11/-2)
To merge this branch: bzr merge lp:~thekorn/zeitgeist/fix-628661-make-check-doc
Reviewer Review Type Date Requested Status
Markus Korn Needs Fixing on 2010-09-03
Siegfried Gevatter 2010-09-02 Approve on 2010-09-02
Review via email: mp+34431@code.launchpad.net

Commit message

Adding 'make check' and 'make doc' commands to the rootlevel makefile (LP: #628661)

Description of the change

Adding 'make check' and 'make doc' to fix bug 628661.

To post a comment you must log in.
Siegfried Gevatter (rainct) wrote :

Great.

review: Approve
Markus Korn (thekorn) wrote :

Hmm, seems like it's not working, `make distcheck` fails

review: Needs Fixing
1567. By Markus Korn on 2010-09-03

Test if the testsuite is available to avoid errors in `make dictcheck` as we
do not ship the tests in our builds

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2010-06-17 21:22:15 +0000
3+++ Makefile.am 2010-09-03 10:20:59 +0000
4@@ -62,3 +62,20 @@
5 else \
6 echo A Bazaar branch is required to generate the ChangeLog >&2; \
7 fi
8+
9+# create API documentation
10+doc: all
11+ make -C doc/zeitgeist html
12+
13+.PHONY: doc
14+
15+# hook into the `make check` command to run the testsuite
16+# if the testsuite is not available (e.g. in the tarball) do nothing
17+# but printing a message
18+check-local:
19+ @if test -e "test/run-all-tests.py"; \
20+ then \
21+ test/run-all-tests.py; \
22+ else \
23+ echo "Cannot run the testsuite, tests are not shipped"; \
24+ fi
25
26=== modified file 'doc/Makefile.am'
27--- doc/Makefile.am 2009-12-16 08:59:10 +0000
28+++ doc/Makefile.am 2010-09-03 10:20:59 +0000
29@@ -5,3 +5,6 @@
30 EXTRA_DIST = \
31 $(man_MANS) \
32 zeitgeist
33+
34+clean: clean-am
35+ make -C zeitgeist/ clean
36
37=== added file 'po/POTFILES.skip'
38--- po/POTFILES.skip 1970-01-01 00:00:00 +0000
39+++ po/POTFILES.skip 2010-09-03 10:20:59 +0000
40@@ -0,0 +1,1 @@
41+tools/gtk/zeitgeist-data-sources-gtk.py
42
43=== modified file 'test/run-all-tests.py'
44--- test/run-all-tests.py 2010-05-15 13:05:14 +0000
45+++ test/run-all-tests.py 2010-09-03 10:20:59 +0000
46@@ -7,8 +7,17 @@
47 import logging
48 import sys
49
50-# redirect all debugging output to stderr
51-logging.basicConfig(stream=sys.stderr)
52+from optparse import OptionParser
53+parser = OptionParser()
54+parser.add_option("-v", action="count", dest="verbosity")
55+(options, args) = parser.parse_args()
56+
57+if options.verbosity:
58+ # do more fine grained stuff later
59+ # redirect all debugging output to stderr
60+ logging.basicConfig(stream=sys.stderr)
61+else:
62+ logging.basicConfig(filename="/dev/null")
63
64 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
65

Subscribers

People subscribed via source and target branches