libfriends

Merge lp:~ken-vandine/libfriends/xvfb into lp:libfriends

  1. xvfb
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Ken VanDine
Approved revision: 71
Merged at revision: 72
Proposed branch: lp:~ken-vandine/libfriends/xvfb
Merge into: lp:libfriends
Diff against target: 12 lines (+1/-1)
1 file modified
tests/vala/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/libfriends/xvfb
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Super Friends Pending
Review via email: mp+166547@code.launchpad.net

Commit message

run xvfb-run with -a

Description of the change

run xvfb-run with -a

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/libfriends-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libfriends-saucy-amd64-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libfriends-ci/3/rebuild

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/vala/Makefile.am'
2--- tests/vala/Makefile.am 2013-02-08 03:40:25 +0000
3+++ tests/vala/Makefile.am 2013-05-30 16:36:27 +0000
4@@ -40,7 +40,7 @@
5 test-runner: test-vala Makefile.am
6 @echo "#!/bin/sh" > $@
7 @echo export G_DEBUG=fatal_criticals >> $@
8- @echo xvfb-run $(DBUS_RUNNER) --task friends-dispatcher -p --test --task-name DBusService --ignore-return --task ./test-vala --wait-for com.canonical.Friends.Dispatcher --task-name Dispatcher >> $@
9+ @echo xvfb-run -a $(DBUS_RUNNER) --task friends-dispatcher -p --test --task-name DBusService --ignore-return --task ./test-vala --wait-for com.canonical.Friends.Dispatcher --task-name Dispatcher >> $@
10 @chmod +x $@
11
12 CLEANFILES = \

Subscribers

People subscribed via source and target branches

to all changes: