Merge lp:~kdub/mir/fix-1379478 into lp:mir

[Kevin DuBois]

fix arm64 package by adding arm64 to the shared library prober test
fixes: lp: #1379478

fix arm64 package by adding arm64 to the shared library prober test
fixes: lp: #1379478

[Colin Watson (cjwatson)]

I can confirm that this builds cleanly on am2, the nearest thing we so far have to an arm64 porter-box.

review: Approve

[Kevin DuBois (kdub)]

> I can confirm that this builds cleanly on am2, the nearest thing we so far
> have to an arm64 porter-box.

Thanks for checking! Haven't gotten sbuild to the point of being cooperative just yet for this arch.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1970
http://jenkins.qa.ubuntu.com/job/mir-ci/1786/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2086
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2023
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/124/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/960
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/960/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3031
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14513

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1786/rebuild

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Failure due to "virtual memory exhausted: Cannot allocate memory". Rekicking.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1970
http://jenkins.qa.ubuntu.com/job/mir-ci/1791/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2092
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2028
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/129/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/965
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/965/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3036
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14543

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1791/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file 'tests/unit-tests/test_data/libarm64.so'
Binary files tests/unit-tests/test_data/libarm64.so	1970-01-01 00:00:00 +0000 and tests/unit-tests/test_data/libarm64.so	2014-10-09 18:59:11 +0000 differ
=== modified file 'tests/unit-tests/test_shared_library_prober.cpp'
--- tests/unit-tests/test_shared_library_prober.cpp	2014-10-01 03:41:21 +0000
+++ tests/unit-tests/test_shared_library_prober.cpp	2014-10-09 18:59:11 +0000
@@ -161,6 +161,7 @@
     EXPECT_CALL(report, loading_library(FilenameMatches("libamd64.so")));
     EXPECT_CALL(report, loading_library(FilenameMatches("libarmhf.so")));
     EXPECT_CALL(report, loading_library(FilenameMatches("libi386.so")));
+    EXPECT_CALL(report, loading_library(FilenameMatches("libarm64.so")));
 
     mir::libraries_for_path(library_path, report);
 }
@@ -170,7 +171,10 @@
     using namespace testing;
     NiceMock<MockSharedLibraryProberReport> report;
 
-    bool armhf_failed{false}, amd64_failed{false}, i386_failed{false};
+    bool armhf_failed{false};
+    bool amd64_failed{false};
+    bool i386_failed{false};
+    bool arm64_failed{false};
 
     ON_CALL(report, loading_failed(FilenameMatches("libamd64.so"), _))
             .WillByDefault(InvokeWithoutArgs([&amd64_failed]() { amd64_failed = true; }));
@@ -178,8 +182,10 @@
             .WillByDefault(InvokeWithoutArgs([&armhf_failed]() { armhf_failed = true; }));
     ON_CALL(report, loading_failed(FilenameMatches("libi386.so"), _))
             .WillByDefault(InvokeWithoutArgs([&i386_failed]() { i386_failed = true; }));
+    ON_CALL(report, loading_failed(FilenameMatches("libarm64.so"), _))
+            .WillByDefault(InvokeWithoutArgs([&arm64_failed]() { arm64_failed = true; }));
 
     mir::libraries_for_path(library_path, report);
 
-    EXPECT_TRUE(i386_failed || amd64_failed || armhf_failed);
+    EXPECT_TRUE(i386_failed || amd64_failed || armhf_failed || arm64_failed);
 }