Merge lp:~cyphermox/ido/xvfb into lp:ido/13.04

Proposed by Mathieu Trudel-Lapierre on 2012-12-05
Status: Merged
Approved by: Didier Roche on 2012-12-05
Approved revision: 120
Merged at revision: 120
Proposed branch: lp:~cyphermox/ido/xvfb
Merge into: lp:ido/13.04
Diff against target: 39 lines (+5/-0)
3 files modified
debian/changelog (+2/-0)
debian/control (+1/-0)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~cyphermox/ido/xvfb
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2012-12-05
Didier Roche 2012-12-05 Approve on 2012-12-05
Review via email: mp+138223@code.launchpad.net

Commit message

Run tests through xfvb-run.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

builds fine here

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-26 16:43:09 +0000
3+++ debian/changelog 2012-12-05 15:44:11 +0000
4@@ -9,11 +9,13 @@
5 other indicator stack packages.
6 - List libgtest-dev explicitly in Build-Depends.
7 - Add Vcs-Bzr, Vcs-Browser fields with a notice to uploaders.
8+ - Add xvfb to Build-Depends.
9 * debian/rules:
10 - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL instead of passing -c4 to
11 dh_makeshlibs.
12 - Override dh_autoreconf to call autogen.sh and not run configure...
13 - Drop the override for dh_makeshlibs.
14+ - Override dh_auto_test to run them through xvfb-run.
15
16 [ Didier Roche ]
17 * Automatic snapshot from revision 118 (bootstrap)
18
19=== modified file 'debian/control'
20--- debian/control 2012-11-19 19:12:44 +0000
21+++ debian/control 2012-12-05 15:44:11 +0000
22@@ -7,6 +7,7 @@
23 gnome-common,
24 libxorg-gtest-dev,
25 libgtest-dev,
26+ xvfb,
27 libglib2.0-dev (>=2.14.0),
28 libgtk-3-dev (>= 3.0),
29 gtk-doc-tools,
30
31=== modified file 'debian/rules'
32--- debian/rules 2012-11-26 15:35:20 +0000
33+++ debian/rules 2012-12-05 15:44:11 +0000
34@@ -12,3 +12,5 @@
35 find debian/tmp/usr/lib -name *.la -delete
36 dh_install --fail-missing
37
38+override_dh_auto_test:
39+ xvfb-run dh_auto_test

Subscribers

People subscribed via source and target branches