Merge lp:~robert-ancell/lightdm/broken-usc-tests into lp:lightdm

Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1804
Merged at revision: 1804
Proposed branch: lp:~robert-ancell/lightdm/broken-usc-tests
Merge into: lp:lightdm
Diff against target: 19 lines (+7/-0)
1 file modified
tests/src/unity-system-compositor.c (+7/-0)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/broken-usc-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+188255@code.launchpad.net

Commit message

Fix tests broken in revision 1801

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
1804. By Robert Ancell

Revert accidental commit

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/src/unity-system-compositor.c'
2--- tests/src/unity-system-compositor.c 2013-08-26 15:16:00 +0000
3+++ tests/src/unity-system-compositor.c 2013-09-30 02:56:20 +0000
4@@ -172,8 +172,15 @@
5 vt_number = atoi (argv[i+1]);
6 i++;
7 }
8+ else if (strcmp (arg, "--file") == 0)
9+ {
10+ /*file = argv[i+1];*/
11+ i++;
12+ }
13 else if (strcmp (arg, "--test") == 0)
14 test = TRUE;
15+ else if (strcmp (arg, "--standalone") == 0)
16+ ;
17 else
18 return EXIT_FAILURE;
19 }

Subscribers

People subscribed via source and target branches