Mir

Merge lp:~ricmm/mir/fix-android-registrar-test into lp:~mir-team/mir/trunk

  1. fix-android-registrar-test
  2. Merge into trunk
Proposed by Ricardo Mendoza
Status: Merged
Approved by: Robert Ancell
Approved revision: no longer in the source branch.
Merged at revision: 813
Proposed branch: lp:~ricmm/mir/fix-android-registrar-test
Merge into: lp:~mir-team/mir/trunk
Diff against target: 20 lines (+3/-2)
1 file modified
tests/unit-tests/client/android/test_client_android_registrar.cpp (+3/-2)
To merge this branch: bzr merge lp:~ricmm/mir/fix-android-registrar-test
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Ancell Approve
Review via email: mp+173106@code.launchpad.net

Commit message

Fix broken tests/unit-tests/client/android/test_client_android_registrar.cpp due to unused return value.

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
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/unit-tests/client/android/test_client_android_registrar.cpp'
2--- tests/unit-tests/client/android/test_client_android_registrar.cpp 2013-07-03 16:57:43 +0000
3+++ tests/unit-tests/client/android/test_client_android_registrar.cpp 2013-07-04 22:40:34 +0000
4@@ -169,13 +169,14 @@
5 auto package = std::make_shared<MirBufferPackage>();
6 package->data_items = 0;
7 package->fd_items = 2;
8- pipe(static_cast<int*>(package->fd));
9-
10+
11+ int ret = pipe(static_cast<int*>(package->fd));
12 {
13 mcla::AndroidRegistrarGralloc registrar(mir::test::fake_shared(stub_module));
14 auto handle = registrar.register_buffer(package);
15 }
16
17+ EXPECT_EQ(0, ret);
18 EXPECT_EQ(-1, fcntl(package->fd[0], F_GETFD));
19 EXPECT_EQ(-1, fcntl(package->fd[1], F_GETFD));
20 }

Subscribers

People subscribed via source and target branches