Merge lp:~kdub/mir/turn-android-ci-on into lp:~mir-team/mir/trunk

[Kevin DuBois]

just bouncing this off jenkins at the moment, don't review yet

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1094
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kdub/mir/turn-android-ci-on/+merge/188091/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/1571/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/815
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/815/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/71/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1094. By Kevin DuBois on 2013-09-27

turn on acceptance and unit tests in debian/rules for android

1093. By Kevin DuBois on 2013-09-27

merge in acceptance fixes

1092. By Kevin DuBois on 2013-09-26

graphics: android: change fb blank request to only by made when there's a change of state. Also correct a failing unit test in trunk

fix: lp-1231594.

Approved by PS Jenkins bot, Robert Carr.

1091. By Daniel d'Andrada on 2013-09-26

Bring back android-input logging functionality

- prefix log message with the tag name from where the log function was called.
- filter log messages by tag name and priority with the ANDROID_LOG_TAGS
  environment var.

Approved by PS Jenkins bot, Alexandros Frantzis, Alan Griffiths.

1090. By Alexandros Frantzis on 2013-09-26

tests: Fix compiler warning about maybe-uninitialized struct member

1089. By Robert Ancell on 2013-09-26

Merge in debian/changelog changes

1088. By Robert Ancell on 2013-09-26

Bump ABI.

Approved by PS Jenkins bot, Kevin DuBois.

1087. By Alan Griffiths on 2013-09-26

frontend, config: Mechanism for connecting via a socket pair.

Approved by PS Jenkins bot, Kevin DuBois, Alexandros Frantzis.

1086. By Kevin DuBois on 2013-09-25

graphics: android: stop nex4 from tearing

fix hwc1.1 to be compliant to the the proper rendering pass by calling the prepare hook, and by waiting on the fence that set() returns, instead of relying on the 'vsync heartbeat signal' to sync to vsync.

fix: lp1195265.

Approved by Alan Griffiths, PS Jenkins bot, Ricardo Salveti.

1085. By Alexandros Frantzis on 2013-09-25

gbm: Blank unused connected outputs.

Approved by Alan Griffiths, PS Jenkins bot.

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp	2013-05-04 00:50:30 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp	2013-09-27 16:15:22 +0000
@@ -14,13 +14,143 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Alan Griffiths <[e-mail]>
- */
-
-#include <std/Log.h>
+ *              Daniel d'Andrada <[e-mail]>
+ */
+
+// License of the original configureInitialState() function:
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <android/log.h>
 #include <std/MirLog.h>
+#include <cctype>
 #include <cstdarg>
 #include <cstdio>
-
+#include <cstdlib>
+#include <cstring>
+
+#define kMaxTagLen  16      /* from the long-dead utils/Log.cpp */
+#define kTagSetSize 16      /* arbitrary */
+
+namespace
+{
+    struct LogState {
+        /* global minimum priority */
+        int     globalMinPriority;
+
+        /* tags and priorities */
+        struct {
+            char    tag[kMaxTagLen];
+            int     minPriority;
+        } tagSet[kTagSetSize];
+    } gLogState = { .globalMinPriority = ANDROID_LOG_UNKNOWN };
+}
+
+/*
+ * Configure logging based on ANDROID_LOG_TAGS environment variable.  We
+ * need to parse a string that looks like
+ *
+ *   *:v jdwp:d dalvikvm:d dalvikvm-gc:i dalvikvmi:i
+ *
+ * The tag (or '*' for the global level) comes first, followed by a colon
+ * and a letter indicating the minimum priority level we're expected to log.
+ * This can be used to reveal or conceal logs with specific tags.
+ *
+ * We also want to check ANDROID_PRINTF_LOG to determine how the output
+ * will look.
+ */
+static void configureInitialState(struct LogState* logState)
+{
+    /* global min priority defaults to "info" level */
+    logState->globalMinPriority = ANDROID_LOG_INFO;
+
+    int entry = 0;
+
+    /*
+     * This is based on the the long-dead utils/Log.cpp code.
+     */
+    const char* tags = getenv("ANDROID_LOG_TAGS");
+    if (tags != NULL) {
+        while (*tags != '\0') {
+            char tagName[kMaxTagLen];
+            int i, minPrio;
+
+            while (isspace(*tags))
+                tags++;
+
+            i = 0;
+            while (*tags != '\0' && !isspace(*tags) && *tags != ':' &&
+                i < kMaxTagLen)
+            {
+                tagName[i++] = *tags++;
+            }
+            if (i == kMaxTagLen) {
+                break;
+            }
+            tagName[i] = '\0';
+
+            /* default priority, if there's no ":" part; also zero out '*' */
+            minPrio = ANDROID_LOG_VERBOSE;
+            if (tagName[0] == '*' && tagName[1] == '\0') {
+                minPrio = ANDROID_LOG_DEBUG;
+                tagName[0] = '\0';
+            }
+
+            if (*tags == ':') {
+                tags++;
+                if (*tags >= '0' && *tags <= '9') {
+                    if (*tags >= ('0' + ANDROID_LOG_SILENT))
+                        minPrio = ANDROID_LOG_VERBOSE;
+                    else
+                        minPrio = *tags - '\0';
+                } else {
+                    switch (*tags) {
+                    case 'v':   minPrio = ANDROID_LOG_VERBOSE;  break;
+                    case 'd':   minPrio = ANDROID_LOG_DEBUG;    break;
+                    case 'i':   minPrio = ANDROID_LOG_INFO;     break;
+                    case 'w':   minPrio = ANDROID_LOG_WARN;     break;
+                    case 'e':   minPrio = ANDROID_LOG_ERROR;    break;
+                    case 'f':   minPrio = ANDROID_LOG_FATAL;    break;
+                    case 's':   minPrio = ANDROID_LOG_SILENT;   break;
+                    default:    minPrio = ANDROID_LOG_DEFAULT;  break;
+                    }
+                }
+
+                tags++;
+                if (*tags != '\0' && !isspace(*tags)) {
+                    break;
+                }
+            }
+
+            if (tagName[0] == 0) {
+                logState->globalMinPriority = minPrio;
+            } else {
+                logState->tagSet[entry].minPriority = minPrio;
+                strcpy(logState->tagSet[entry].tag, tagName);
+                entry++;
+            }
+        }
+    }
+
+    if (entry < kTagSetSize) {
+        // Mark the end of this array
+        logState->tagSet[entry].minPriority = ANDROID_LOG_UNKNOWN;
+        logState->tagSet[entry].tag[0] = '\0';
+    }
+}
 
 extern "C" int __android_log_print(int prio, const char *tag, const char *fmt, ...)
 {
@@ -30,7 +160,29 @@
     int result = vsnprintf(buffer, sizeof buffer - 1, fmt, ap);
     va_end(ap);
 
-    mir::write_to_log(prio, buffer);
+    if (gLogState.globalMinPriority == ANDROID_LOG_UNKNOWN) {
+        configureInitialState(&gLogState);
+    }
+
+    /* see if this log tag is configured */
+    int minPrio = gLogState.globalMinPriority;
+    for (int i = 0; i < kTagSetSize; i++) {
+        if (gLogState.tagSet[i].minPriority == ANDROID_LOG_UNKNOWN)
+            break;      /* reached end of configured values */
+
+        if (strcmp(gLogState.tagSet[i].tag, tag) == 0) {
+            minPrio = gLogState.tagSet[i].minPriority;
+            break;
+        }
+    }
+
+    if (prio >= minPrio) {
+        char taggedBuffer[1024];
+        sprintf(taggedBuffer, "[%s]%s", tag, buffer);
+        mir::write_to_log(prio, taggedBuffer);
+    } else {
+        // filter out log message
+    }
 
     return result;
 }

=== modified file 'debian/rules'
--- debian/rules	2013-09-23 13:52:58 +0000
+++ debian/rules	2013-09-27 16:15:22 +0000
@@ -22,8 +22,6 @@
 	dh_auto_configure -- \
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DMIR_PLATFORM=android \
-	  -DMIR_ENABLE_UNIT_TESTS=NO \
-	  -DMIR_ENABLE_ACCEPTANCE_TESTS=NO \
 	  -DMIR_ENABLE_INTEGRATION_TESTS=NO
 else
 ifeq ($(DEB_HOST_ARCH),powerpc)

=== modified file 'include/test/mir_test_framework/display_server_test_fixture.h'
--- include/test/mir_test_framework/display_server_test_fixture.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_framework/display_server_test_fixture.h	2013-09-27 16:15:22 +0000
@@ -46,6 +46,7 @@
 
 private:
     static TestingProcessManager process_manager;
+    static TestingServerConfiguration default_parameters;
 
     virtual void TearDown();
 };
@@ -74,6 +75,7 @@
 
 private:
     TestingProcessManager process_manager;
+    std::shared_ptr<mir::options::Option> test_options;
 };
 
 }

=== added file 'include/test/mir_test_framework/stub_client_connection_configuration.h'
--- include/test/mir_test_framework/stub_client_connection_configuration.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test_framework/stub_client_connection_configuration.h	2013-09-27 16:15:22 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_TESTING_STUB_CLIENT_CONNECTION_CONFIGURATION
+#define MIR_TESTING_STUB_CLIENT_CONNECTION_CONFIGURATION
+
+#include "src/client/default_connection_configuration.h"
+#include <memory>
+
+namespace mir_test_framework
+{
+
+struct StubConnectionConfiguration : public mir::client::DefaultConnectionConfiguration
+{
+    StubConnectionConfiguration(std::string const& socket_file);
+    std::shared_ptr<mir::client::ClientPlatformFactory> the_client_platform_factory() override;
+};
+
+}
+#endif /* MIR_TESTING_STUB_CLIENT_CONNECTION_CONFIGURATION */

=== added file 'include/test/mir_test_framework/testing_client_configuration.h'
--- include/test/mir_test_framework/testing_client_configuration.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test_framework/testing_client_configuration.h	2013-09-27 16:15:22 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_TESTING_CLIENT_CONFIGURATION
+#define MIR_TESTING_CLIENT_CONFIGURATION
+
+#include "mir/options/option.h"
+
+namespace mir_test_framework
+{
+
+struct TestingClientConfiguration
+{
+    virtual ~TestingClientConfiguration() = default;
+
+    // Code to run in client process
+    virtual void exec() = 0;
+
+    //clients respect the tests-use-real-graphics option by default. use
+    //this function to force the use of the default client configuraiton
+    virtual bool use_real_graphics(mir::options::Option const& options)
+    {
+        return options.get("tests-use-real-graphics", false);
+    } 
+};
+
+}
+#endif /* MIR_TESTING_CLIENT_CONFIGURATION */

=== modified file 'include/test/mir_test_framework/testing_process_manager.h'
--- include/test/mir_test_framework/testing_process_manager.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_framework/testing_process_manager.h	2013-09-27 16:15:22 +0000
@@ -24,6 +24,7 @@
 #include "mir_test_framework/process.h"
 
 #include "mir_test_framework/testing_server_configuration.h"
+#include "mir_test_framework/testing_client_configuration.h"
 
 #include <memory>
 #include <list>
@@ -32,19 +33,16 @@
 namespace mir
 {
 class DisplayServer;
+namespace options
+{
+class Option;
+}
 }
 
 namespace mir_test_framework
 {
 using namespace mir;
 
-struct TestingClientConfiguration
-{
-    virtual ~TestingClientConfiguration() = default;
-    // Code to run in client process
-    virtual void exec() = 0;
-};
-
 
 class TestingProcessManager
 {
@@ -53,7 +51,8 @@
     ~TestingProcessManager();
 
     void launch_server_process(TestingServerConfiguration& config);
-    void launch_client_process(TestingClientConfiguration& config);
+    void launch_client_process(TestingClientConfiguration& config,
+                               mir::options::Option const& test_options);
 
     void tear_down_clients();
     void tear_down_server();

=== modified file 'src/client/mir_client_library.cpp'
--- src/client/mir_client_library.cpp	2013-08-28 03:41:48 +0000
+++ src/client/mir_client_library.cpp	2013-09-27 16:15:22 +0000
@@ -77,7 +77,8 @@
 
 }
 
-MirWaitHandle* mir_connect(char const* socket_file, char const* name, mir_connected_callback callback, void * context)
+MirWaitHandle* mir_default_connect(
+    char const* socket_file, char const* name, mir_connected_callback callback, void * context)
 {
 
     try
@@ -93,7 +94,7 @@
             else
                 sock = mir::default_server_socket;
         }
- 
+
         mcl::DefaultConnectionConfiguration conf{sock};
 
         MirConnection* connection = new MirConnection(conf);
@@ -110,6 +111,42 @@
     }
 }
 
+
+void mir_default_connection_release(MirConnection * connection)
+{
+    if (!error_connections.contains(connection))
+    {
+        auto wait_handle = connection->disconnect();
+        wait_handle->wait_for_all();
+    }
+    else
+    {
+        error_connections.remove(connection);
+    }
+
+    delete connection;
+}
+
+//mir_connect and mir_connection_release can be overridden by test code that sets these function
+//pointers to do things like stub out the graphics drivers or change the connection configuration.
+
+//TODO: we could have a more comprehensive solution that allows us to substitute any of the functions
+//for test purposes, not just the connect functions
+MirWaitHandle* (*mir_connect_impl)(
+    char const *server, char const *app_name,
+    mir_connected_callback callback, void *context) = mir_default_connect;
+void (*mir_connection_release_impl) (MirConnection *connection) = mir_default_connection_release;
+
+MirWaitHandle* mir_connect(char const* socket_file, char const* name, mir_connected_callback callback, void * context)
+{
+    return mir_connect_impl(socket_file, name, callback, context);
+}
+
+void mir_connection_release(MirConnection *connection)
+{
+    return mir_connection_release_impl(connection);
+}
+
 MirConnection *mir_connect_sync(char const *server,
                                              char const *app_name)
 {
@@ -131,21 +168,6 @@
     return connection->get_error_message();
 }
 
-void mir_connection_release(MirConnection * connection)
-{
-    if (!error_connections.contains(connection))
-    {
-        auto wait_handle = connection->disconnect();
-        wait_handle->wait_for_all();
-    }
-    else
-    {
-        error_connections.remove(connection);
-    }
-
-    delete connection;
-}
-
 MirEGLNativeDisplayType mir_connection_get_egl_native_display(MirConnection *connection)
 {
     return connection->egl_native_display();

=== modified file 'src/server/graphics/android/hwc_common_device.cpp'
--- src/server/graphics/android/hwc_common_device.cpp	2013-09-18 16:08:14 +0000
+++ src/server/graphics/android/hwc_common_device.cpp	2013-09-27 16:15:22 +0000
@@ -97,22 +97,24 @@
     coordinator->notify_vsync();
 }
 
-void mga::HWCCommonDevice::blank_or_unblank_screen(bool blank)
+void mga::HWCCommonDevice::blank_or_unblank_screen(bool blank_request)
 {
     std::unique_lock<std::mutex> lg(blanked_mutex);
-                                             
-    int err = hwc_device->blank(hwc_device.get(), HWC_DISPLAY_PRIMARY, blank);
-    if (err)
+
+    if (blank_request != blanked)
     {
-        std::string blanking_status_msg = "Could not " + 
-            (blank ? std::string("blank") : std::string("unblank")) + " display";
-        BOOST_THROW_EXCEPTION(
-            boost::enable_error_info(
-                std::runtime_error(blanking_status_msg)) <<
-            boost::errinfo_errno(-err));
-    }    
-    blanked = blank;
-    blanked_cond.notify_all();
+        if(auto err = hwc_device->blank(hwc_device.get(), HWC_DISPLAY_PRIMARY, blank_request))
+        {
+            std::string blanking_status_msg = "Could not " + 
+                (blank_request ? std::string("blank") : std::string("unblank")) + " display";
+            BOOST_THROW_EXCEPTION(
+                boost::enable_error_info(
+                    std::runtime_error(blanking_status_msg)) <<
+                boost::errinfo_errno(-err));
+        }    
+        blanked = blank_request;
+        blanked_cond.notify_all();
+    }
 }
 
 std::unique_lock<std::mutex> mga::HWCCommonDevice::lock_unblanked()

=== modified file 'tests/acceptance-tests/test_client_authorization.cpp'
--- tests/acceptance-tests/test_client_authorization.cpp	2013-08-28 03:41:48 +0000
+++ tests/acceptance-tests/test_client_authorization.cpp	2013-09-27 16:15:22 +0000
@@ -253,6 +253,13 @@
             mir_connection_release(connection);
         }
 
+        //we are testing the connect function itself, without getting to the
+        // point where drivers are used, so force using production config
+        bool use_real_graphics(mir::options::Option const&) override
+        {
+            return true;
+        }
+
         ClientPidTestFixture::SharedRegion* shared_region;
     } client_config(shared_region);
     launch_client_process(client_config);    

=== modified file 'tests/acceptance-tests/test_client_focus_notification.cpp'
--- tests/acceptance-tests/test_client_focus_notification.cpp	2013-09-17 14:31:42 +0000
+++ tests/acceptance-tests/test_client_focus_notification.cpp	2013-09-27 16:15:22 +0000
@@ -30,13 +30,6 @@
 namespace mt = mir::test;
 namespace mtf = mir_test_framework;
 
-// TODO resolve problems running tests on android
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID(name) name
-#endif
-
 namespace
 {
     char const* const mir_test_socket = mtf::test_socket_file().c_str();
@@ -147,7 +140,7 @@
 
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_ON_ANDROID(a_surface_is_notified_of_receiving_focus))
+TEST_F(BespokeDisplayServerTestFixture, a_surface_is_notified_of_receiving_focus)
 {
     using namespace ::testing;
 
@@ -176,7 +169,7 @@
 
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_ON_ANDROID(two_surfaces_are_notified_of_gaining_and_losing_focus))
+TEST_F(BespokeDisplayServerTestFixture, two_surfaces_are_notified_of_gaining_and_losing_focus)
 {
     using namespace ::testing;
     

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2013-09-20 15:48:40 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2013-09-27 16:15:22 +0000
@@ -63,13 +63,6 @@
 namespace mtd = mt::doubles;
 namespace mtf = mir_test_framework;
 
-// TODO resolve problems running tests on android
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID(name) name
-#endif
-
 namespace
 {
     char const* const mir_test_socket = mtf::test_socket_file().c_str();
@@ -312,7 +305,7 @@
 
 using TestClientInput = BespokeDisplayServerTestFixture;
 
-TEST_F(TestClientInput, DISABLED_ON_ANDROID(clients_receive_key_input))
+TEST_F(TestClientInput, clients_receive_key_input)
 {
     using namespace ::testing;
     
@@ -358,7 +351,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(TestClientInput, DISABLED_ON_ANDROID(clients_receive_us_english_mapped_keys))
+TEST_F(TestClientInput, clients_receive_us_english_mapped_keys)
 {
     using namespace ::testing;
     static std::string const test_client_name = "1";
@@ -404,7 +397,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(TestClientInput, DISABLED_ON_ANDROID(clients_receive_motion_inside_window))
+TEST_F(TestClientInput, clients_receive_motion_inside_window)
 {
     using namespace ::testing;
     static std::string const test_client_name = "1";
@@ -453,7 +446,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(TestClientInput, DISABLED_ON_ANDROID(clients_receive_button_events_inside_window))
+TEST_F(TestClientInput, clients_receive_button_events_inside_window)
 {
     using namespace ::testing;
     
@@ -534,7 +527,7 @@
 
 }
 
-TEST_F(TestClientInput, DISABLED_ON_ANDROID(multiple_clients_receive_motion_inside_windows))
+TEST_F(TestClientInput, multiple_clients_receive_motion_inside_windows)
 {
     using namespace ::testing;
     
@@ -646,7 +639,7 @@
     std::vector<geom::Rectangle> const input_rectangles;
 };
 }
-TEST_F(TestClientInput, DISABLED_ON_ANDROID(clients_do_not_receive_motion_outside_input_region))
+TEST_F(TestClientInput, clients_do_not_receive_motion_outside_input_region)
 {
     using namespace ::testing;
     static std::string const test_client_name = "1";
@@ -735,7 +728,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(TestClientInput, DISABLED_ON_ANDROID(surfaces_obscure_motion_events_by_stacking))
+TEST_F(TestClientInput, surfaces_obscure_motion_events_by_stacking)
 {
     using namespace ::testing;
     
@@ -853,7 +846,7 @@
 
 }
 
-TEST_F(TestClientInput, DISABLED_ON_ANDROID(hidden_clients_do_not_receive_pointer_events))
+TEST_F(TestClientInput, hidden_clients_do_not_receive_pointer_events)
 {
     using namespace ::testing;
     

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2013-09-24 11:07:53 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2013-09-27 16:15:22 +0000
@@ -42,13 +42,6 @@
 namespace mcl = mir::client;
 namespace mtf = mir_test_framework;
 
-// TODO resolve problems running tests on android
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID(name) name
-#endif
-
 namespace
 {
     char const* const mir_test_socket = mtf::test_socket_file().c_str();
@@ -157,7 +150,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(client_library_creates_surface))
+TEST_F(DefaultDisplayServerTestFixture, client_library_creates_surface)
 {
     struct ClientConfig : ClientConfigCommon
     {
@@ -220,7 +213,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(surface_types))
+TEST_F(DefaultDisplayServerTestFixture, surface_types)
 {
     struct ClientConfig : ClientConfigCommon
     {
@@ -295,7 +288,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(client_can_set_surface_state))
+TEST_F(DefaultDisplayServerTestFixture, client_can_set_surface_state)
 {
     struct ClientConfig : ClientConfigCommon
     {
@@ -363,7 +356,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(client_receives_surface_state_events))
+TEST_F(DefaultDisplayServerTestFixture, client_receives_surface_state_events)
 {
     struct ClientConfig : ClientConfigCommon
     {
@@ -528,13 +521,19 @@
 
             mir_connection_release(connection);
         }
+
+        // this test relies on gbm drivers, use real graphics always
+        bool use_real_graphics(mir::options::Option const&) override
+        {
+            return true;
+        }
     } client_config;
 
     launch_client_process(client_config);
 }
 #endif
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(client_library_creates_multiple_surfaces))
+TEST_F(DefaultDisplayServerTestFixture, client_library_creates_multiple_surfaces)
 {
     int const n_surfaces = 13;
 
@@ -612,7 +611,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(client_library_accesses_and_advances_buffers))
+TEST_F(DefaultDisplayServerTestFixture, client_library_accesses_and_advances_buffers)
 {
     struct ClientConfig : ClientConfigCommon
     {
@@ -652,7 +651,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(fully_synchronous_client))
+TEST_F(DefaultDisplayServerTestFixture, fully_synchronous_client)
 {
     struct ClientConfig : ClientConfigCommon
     {
@@ -694,7 +693,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(highly_threaded_client))
+TEST_F(DefaultDisplayServerTestFixture, highly_threaded_client)
 {
     struct ClientConfig : ClientConfigCommon
     {
@@ -838,6 +837,13 @@
                 FAIL() << error;
             }
         }
+
+        //we are testing the connect function itself, without getting to the
+        // point where drivers are used, so force using production config
+        bool use_real_graphics(mir::options::Option const&) override
+        {
+            return true;
+        }
     } client_config;
 
     launch_client_process(client_config);
@@ -867,6 +873,13 @@
 
             mir_connection_release(connection);
         }
+
+        //we are testing the connect function itself, without getting to the
+        // point where drivers are used, so force using production config
+        bool use_real_graphics(mir::options::Option const&) override
+        {
+            return true;
+        }
     } client_config;
 
     launch_client_process(client_config);
@@ -878,7 +891,7 @@
     signalled = true;
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(ClientLibraryThreadsHandleNoSignals))
+TEST_F(DefaultDisplayServerTestFixture, ClientLibraryThreadsHandleNoSignals)
 {
     struct ClientConfig : ClientConfigCommon
     {
@@ -961,7 +974,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(MultiSurfaceClientTracksBufferFdsCorrectly))
+TEST_F(DefaultDisplayServerTestFixture, MultiSurfaceClientTracksBufferFdsCorrectly)
 {
     struct ClientConfig : ClientConfigCommon
     {

=== modified file 'tests/acceptance-tests/test_focus_selection.cpp'
--- tests/acceptance-tests/test_focus_selection.cpp	2013-09-17 14:31:42 +0000
+++ tests/acceptance-tests/test_focus_selection.cpp	2013-09-27 16:15:22 +0000
@@ -41,13 +41,6 @@
 namespace mt = mir::test;
 namespace mtf = mir_test_framework;
 
-// TODO resolve problems running tests on android
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID(name) name
-#endif
-
 namespace
 {
     char const* const mir_test_socket = mtf::test_socket_file().c_str();
@@ -134,7 +127,7 @@
 }
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_ON_ANDROID(sessions_creating_surface_receive_focus))
+TEST_F(BespokeDisplayServerTestFixture, sessions_creating_surface_receive_focus)
 {
     struct ServerConfig : TestingServerConfiguration
     {
@@ -168,7 +161,7 @@
     launch_client_process(client);
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_ON_ANDROID(surfaces_receive_input_focus_when_created))
+TEST_F(BespokeDisplayServerTestFixture, surfaces_receive_input_focus_when_created)
 {
     struct ServerConfig : TestingServerConfiguration
     {

=== modified file 'tests/acceptance-tests/test_server_shutdown.cpp'
--- tests/acceptance-tests/test_server_shutdown.cpp	2013-09-24 11:43:27 +0000
+++ tests/acceptance-tests/test_server_shutdown.cpp	2013-09-27 16:15:22 +0000
@@ -39,13 +39,6 @@
 namespace ms = mir::surfaces;
 namespace geom = mir::geometry;
 
-// TODO resolve problems running tests on android
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID(name) name
-#endif
-
 namespace
 {
 
@@ -119,7 +112,7 @@
 
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_ON_ANDROID(server_can_shut_down_when_clients_are_blocked))
+TEST_F(BespokeDisplayServerTestFixture, server_can_shut_down_when_clients_are_blocked)
 {
     Flag next_buffer_done1{"next_buffer_done1_c5d49978.tmp"};
     Flag next_buffer_done2{"next_buffer_done2_c5d49978.tmp"};
@@ -206,7 +199,7 @@
     });
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_ON_ANDROID(server_releases_resources_on_shutdown_with_connected_clients))
+TEST_F(BespokeDisplayServerTestFixture, server_releases_resources_on_shutdown_with_connected_clients)
 {
     Flag surface_created1{"surface_created1_7e9c69fc.tmp"};
     Flag surface_created2{"surface_created2_7e9c69fc.tmp"};

=== modified file 'tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp'
--- tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp	2013-09-17 14:31:42 +0000
+++ tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp	2013-09-27 16:15:22 +0000
@@ -34,13 +34,6 @@
 namespace mtd = mt::doubles;
 namespace mtf = mir_test_framework;
 
-// TODO resolve problems running tests on android
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID(name) name
-#endif
-
 namespace
 {
     char const* const mir_test_socket = mtf::test_socket_file().c_str();
@@ -77,7 +70,7 @@
 
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_ON_ANDROID(the_shell_surface_configurator_is_notified_of_attribute_changes))
+TEST_F(BespokeDisplayServerTestFixture, the_shell_surface_configurator_is_notified_of_attribute_changes)
 {
     struct ServerConfiguration : TestingServerConfiguration
     {
@@ -116,7 +109,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_ON_ANDROID(the_shell_surface_configurator_may_interfere_with_attribute_changes))
+TEST_F(BespokeDisplayServerTestFixture, the_shell_surface_configurator_may_interfere_with_attribute_changes)
 {
     struct ServerConfiguration : TestingServerConfiguration
     {

=== modified file 'tests/acceptance-tests/test_surfaceloop.cpp'
--- tests/acceptance-tests/test_surfaceloop.cpp	2013-09-17 14:31:42 +0000
+++ tests/acceptance-tests/test_surfaceloop.cpp	2013-09-27 16:15:22 +0000
@@ -36,13 +36,6 @@
 namespace mcl = mir::client;
 namespace mtf = mir_test_framework;
 
-// TODO resolve problems running tests on android
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID(name) name
-#endif
-
 namespace
 {
 char const* const mir_test_socket = mtf::test_socket_file().c_str();
@@ -161,7 +154,7 @@
 }
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(creates_surface_of_correct_size))
+TEST_F(DefaultDisplayServerTestFixture, creates_surface_of_correct_size)
 {
     struct Client : ClientConfigCommon
     {
@@ -215,7 +208,7 @@
     launch_client_process(client_creates_surfaces);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(surfaces_have_distinct_ids))
+TEST_F(DefaultDisplayServerTestFixture, surfaces_have_distinct_ids)
 {
     struct Client : ClientConfigCommon
     {
@@ -260,7 +253,7 @@
     launch_client_process(client_creates_surfaces);
 }
 
-TEST_F(DefaultDisplayServerTestFixture, DISABLED_ON_ANDROID(creates_multiple_surfaces_async))
+TEST_F(DefaultDisplayServerTestFixture, creates_multiple_surfaces_async)
 {
     struct Client : ClientConfigCommon
     {

=== modified file 'tests/acceptance-tests/test_surfaces_with_output_id.cpp'
--- tests/acceptance-tests/test_surfaces_with_output_id.cpp	2013-09-17 14:31:42 +0000
+++ tests/acceptance-tests/test_surfaces_with_output_id.cpp	2013-09-27 16:15:22 +0000
@@ -43,13 +43,6 @@
 namespace mg = mir::graphics;
 namespace mtd = mir::test::doubles;
 
-// TODO resolve problems running tests on android
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID(name) name
-#endif
-
 namespace
 {
 char const* const mir_test_socket = mtf::test_socket_file().c_str();
@@ -128,7 +121,7 @@
 
 using SurfacesWithOutputId = BespokeDisplayServerTestFixture;
 
-TEST_F(SurfacesWithOutputId, DISABLED_ON_ANDROID(fullscreen_surfaces_are_placed_at_top_left_of_correct_output))
+TEST_F(SurfacesWithOutputId, fullscreen_surfaces_are_placed_at_top_left_of_correct_output)
 {
     mt::CrossProcessAction client_connect_and_create_surface;
     mt::CrossProcessAction client_release_surface_and_disconnect;
@@ -266,7 +259,7 @@
     });
 }
 
-TEST_F(SurfacesWithOutputId, DISABLED_ON_ANDROID(non_fullscreen_surfaces_are_not_accepted))
+TEST_F(SurfacesWithOutputId, non_fullscreen_surfaces_are_not_accepted)
 {
     mt::CrossProcessAction client_connect_and_create_surfaces;
     mt::CrossProcessAction client_disconnect;

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2013-08-28 03:41:48 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2013-09-27 16:15:22 +0000
@@ -13,6 +13,7 @@
   testing_server_options.cpp
   input_testing_server_options.cpp
   testing_process_manager.cpp
+  testing_client_options.cpp
   display_server_test_fixture.cpp
   process.cpp
 )

=== modified file 'tests/mir_test_framework/display_server_test_fixture.cpp'
--- tests/mir_test_framework/display_server_test_fixture.cpp	2013-08-28 03:41:48 +0000
+++ tests/mir_test_framework/display_server_test_fixture.cpp	2013-09-27 16:15:22 +0000
@@ -17,20 +17,22 @@
  */
 
 #include "mir_test_framework/display_server_test_fixture.h"
+#include "mir_test_framework/testing_client_configuration.h"
+#include "src/client/mir_connection.h"
 
 namespace mc = mir::compositor;
-
-mir_test_framework::TestingProcessManager mir_test_framework::DefaultDisplayServerTestFixture::process_manager;
-
+namespace mtf = mir_test_framework;
+
+mtf::TestingProcessManager mir_test_framework::DefaultDisplayServerTestFixture::process_manager;
+mtf::TestingServerConfiguration mir_test_framework::DefaultDisplayServerTestFixture::default_parameters;
 
 void DefaultDisplayServerTestFixture::launch_client_process(TestingClientConfiguration& config)
 {
-    process_manager.launch_client_process(config);
+    process_manager.launch_client_process(config, *default_parameters.the_options());
 }
 
 void DefaultDisplayServerTestFixture::SetUpTestCase()
 {
-    TestingServerConfiguration default_parameters;
     process_manager.launch_server_process(default_parameters);
 }
 
@@ -54,12 +56,13 @@
 
 void BespokeDisplayServerTestFixture::launch_server_process(TestingServerConfiguration& functor)
 {
+    test_options = functor.the_options();
     process_manager.launch_server_process(functor);
 }
 
 void BespokeDisplayServerTestFixture::launch_client_process(TestingClientConfiguration& config)
 {
-    process_manager.launch_client_process(config);
+    process_manager.launch_client_process(config, *test_options);
 }
 
 bool BespokeDisplayServerTestFixture::shutdown_server_process()

=== added file 'tests/mir_test_framework/testing_client_options.cpp'
--- tests/mir_test_framework/testing_client_options.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/testing_client_options.cpp	2013-09-27 16:15:22 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#include "mir_test_framework/testing_client_configuration.h"
+#include "mir_test_framework/stub_client_connection_configuration.h"
+#include "mir/options/program_option.h"
+#include "src/client/default_connection_configuration.h"
+#include "src/client/client_platform_factory.h"
+#include "src/client/client_buffer_factory.h"
+#include "src/client/client_buffer.h"
+#include "src/client/client_platform.h"
+#include "src/client/mir_connection.h"
+
+namespace mcl = mir::client;
+namespace mtf=mir_test_framework;
+namespace geom = mir::geometry;
+
+
+namespace
+{
+class StubClientBuffer : public mcl::ClientBuffer
+{
+    std::shared_ptr<mcl::MemoryRegion> secure_for_cpu_write()
+    {
+        return nullptr;
+    }
+
+    geom::Size size() const
+    {
+        return geom::Size{};
+    }
+
+    geom::Stride stride() const
+    {
+        return geom::Stride{};
+    }
+
+    geom::PixelFormat pixel_format() const
+    {
+        return geom::PixelFormat::abgr_8888;
+    }
+    
+    uint32_t age() const
+    {
+        return 0;
+    }
+    void increment_age()
+    {
+    }
+    void mark_as_submitted()
+    {
+    }
+    std::shared_ptr<MirNativeBuffer> native_buffer_handle() const
+    {
+        return nullptr;
+    }
+};
+
+struct StubClientBufferFactory : public mcl::ClientBufferFactory
+{
+    std::shared_ptr<mcl::ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const&,
+                                                     geom::Size, geom::PixelFormat)
+    {
+        return std::make_shared<StubClientBuffer>();
+    }
+};
+
+struct StubClientPlatform : public mcl::ClientPlatform
+{
+    MirPlatformType platform_type() const
+    {
+        return mir_platform_type_gbm;
+    }
+
+    std::shared_ptr<mcl::ClientBufferFactory> create_buffer_factory()
+    {
+        return std::make_shared<StubClientBufferFactory>();
+    }
+
+    std::shared_ptr<EGLNativeWindowType> create_egl_native_window(mcl::ClientSurface*)
+    {
+        auto fake_window = reinterpret_cast<EGLNativeWindowType>(0x12345678);
+        return std::make_shared<EGLNativeWindowType>(fake_window);
+    }
+
+    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display()
+    {
+        auto fake_display = reinterpret_cast<EGLNativeDisplayType>(0x12345678);
+        return std::make_shared<EGLNativeDisplayType>(fake_display);
+    }
+};
+
+struct StubClientPlatformFactory : public mcl::ClientPlatformFactory
+{
+    std::shared_ptr<mcl::ClientPlatform> create_client_platform(mcl::ClientContext*)
+    {
+        return std::make_shared<StubClientPlatform>();
+    }
+};
+
+}
+
+mtf::StubConnectionConfiguration::StubConnectionConfiguration(std::string const& socket_file)
+    : DefaultConnectionConfiguration(socket_file)
+{
+}
+
+std::shared_ptr<mcl::ClientPlatformFactory> mtf::StubConnectionConfiguration::the_client_platform_factory()
+{
+    return std::make_shared<StubClientPlatformFactory>();
+}

=== modified file 'tests/mir_test_framework/testing_process_manager.cpp'
--- tests/mir_test_framework/testing_process_manager.cpp	2013-09-19 18:18:35 +0000
+++ tests/mir_test_framework/testing_process_manager.cpp	2013-09-27 16:15:22 +0000
@@ -16,8 +16,11 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
+#include "mir_toolkit/client_types.h"
 #include "mir_test_framework/testing_process_manager.h"
 #include "mir_test_framework/detect_server.h"
+#include "mir_test_framework/stub_client_connection_configuration.h"
+#include "src/client/mir_connection.h"
 #include "mir/run_mir.h"
 
 #include <gmock/gmock.h>
@@ -25,6 +28,7 @@
 #include <thread>
 #include <stdexcept>
 
+namespace mo = mir::options;
 namespace mc = mir::compositor;
 namespace mtf = mir_test_framework;
 
@@ -76,7 +80,38 @@
     }
 }
 
-void mtf::TestingProcessManager::launch_client_process(TestingClientConfiguration& config)
+/* if set before any calls to the api functions, assigning to this pointer will allow user to
+ * override calls to mir_connect() and mir_connection_release(). This is mostly useful in test scenarios
+ */
+extern MirWaitHandle* (*mir_connect_impl)(
+    char const *server,
+    char const *app_name,
+    mir_connected_callback callback,
+    void *context);
+extern void (*mir_connection_release_impl) (MirConnection *connection);
+
+namespace
+{
+MirWaitHandle* mir_connect_test_override(
+    char const *socket_file,
+    char const *app_name,
+    mir_connected_callback callback,
+    void *context)
+{
+    mtf::StubConnectionConfiguration conf(socket_file);
+    auto connection = new MirConnection(conf);
+    return connection->connect(app_name, callback, context);
+}
+
+void mir_connection_release_override(MirConnection *connection)
+{
+    auto wait_handle = connection->disconnect();
+    wait_handle->wait_for_all();
+    delete connection;
+}
+}
+
+void mtf::TestingProcessManager::launch_client_process(TestingClientConfiguration& config, mo::Option const& test_options)
 {
     if (!is_test_process)
     {
@@ -108,6 +143,11 @@
         server_process.reset();
 
         SCOPED_TRACE("Client");
+        if (!config.use_real_graphics(test_options))
+        {
+            mir_connect_impl = mir_connect_test_override;
+            mir_connection_release_impl = mir_connection_release_override;
+        }
         config.exec();
         exit(::testing::Test::HasFailure() ? EXIT_FAILURE : EXIT_SUCCESS);
     }

=== modified file 'tests/unit-tests/graphics/android/test_hwc_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc_device.cpp	2013-09-25 15:46:05 +0000
+++ tests/unit-tests/graphics/android/test_hwc_device.cpp	2013-09-27 16:15:22 +0000
@@ -184,9 +184,12 @@
     EXPECT_CALL(*this->mock_device, blank_interface(this->mock_device.get(), HWC_DISPLAY_PRIMARY, 0))
         .Times(1)
         .WillOnce(Return(0));
-    EXPECT_CALL(*this->mock_device, blank_interface(this->mock_device.get(), HWC_DISPLAY_PRIMARY, 0))
+    EXPECT_CALL(*this->mock_device, blank_interface(this->mock_device.get(), HWC_DISPLAY_PRIMARY, 1))
         .Times(1)
         .WillOnce(Return(-1));
+    EXPECT_CALL(*this->mock_device, blank_interface(this->mock_device.get(), HWC_DISPLAY_PRIMARY, 1))
+        .Times(1)
+        .WillOnce(Return(0));
 
     auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
                                              this->mock_fbdev, this->mock_vsync);
@@ -195,6 +198,27 @@
     }, std::runtime_error);
 }
 
+TYPED_TEST(HWCCommon, test_blank_is_ignored_if_already_in_correct_state)
+{
+    using namespace testing;
+
+    //we start off unblanked
+
+    InSequence seq;
+    //from constructor
+    EXPECT_CALL(*this->mock_device, blank_interface(this->mock_device.get(), HWC_DISPLAY_PRIMARY, 0))
+        .Times(Exactly(1))
+        .WillOnce(Return(0));
+     //from destructor
+    EXPECT_CALL(*this->mock_device, blank_interface(this->mock_device.get(), HWC_DISPLAY_PRIMARY, 1))
+        .Times(1)
+        .WillOnce(Return(0));
+
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
+                                             this->mock_fbdev, this->mock_vsync);
+    device->blank_or_unblank_screen(false);
+}
+
 TYPED_TEST(HWCCommon, test_hwc_display_is_deactivated_on_destroy)
 {
     auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,

=== modified file 'tests/unit-tests/logging/test_legacy_input_report.cpp'
--- tests/unit-tests/logging/test_legacy_input_report.cpp	2013-05-28 17:55:26 +0000
+++ tests/unit-tests/logging/test_legacy_input_report.cpp	2013-09-27 16:15:22 +0000
@@ -29,6 +29,8 @@
 namespace ml  = mir::logging;
 namespace mli = mir::logging::legacy_input_report;
 
+using testing::_;
+
 namespace
 {
 class MockLogger : public ml::Logger
@@ -49,69 +51,64 @@
 };
 
 char const* const component = "android-input";
-char const* const LOG_TAG = 0;
+char const* const LOG_TAG = "Foo";
 }
 
 TEST_F(InputReport, debug_message)
 {
-    EXPECT_CALL(logger, log(
-            ml::Logger::debug,
-            testing::HasSubstr(__PRETTY_FUNCTION__),
-            component));
+    // default minimum log priority is "informational". "debug" is lower than that.
+    EXPECT_CALL(logger, log(_, _, _)).Times(0);
 
-  ALOG(LOG_DEBUG, NULL, "Test function is %s", __PRETTY_FUNCTION__);
+    ALOG(LOG_DEBUG, NULL, "Test function is %s", __PRETTY_FUNCTION__);
 }
 
 TEST_F(InputReport, unknown_message)
 {
     char const* const unknown = "Unknown message";
 
-    EXPECT_CALL(logger, log(
-            ml::Logger::debug,
-            unknown,
-            component));
+    // default minimum log priority is "informational". "unknown" is lower than that.
+    // Actually, I don't think this is even a valid priority.
+    EXPECT_CALL(logger, log(_, _, _)).Times(0);
 
-  ALOG(LOG_UNKNOWN, NULL, unknown);
+    ALOG(LOG_UNKNOWN, NULL, unknown);
 }
 
 TEST_F(InputReport, verbose_message)
 {
     char const* const verbose = "A very long story. (OK, I lied.)";
 
-    EXPECT_CALL(logger, log(
-            ml::Logger::debug,
-            verbose,
-            component));
+    // default minimum log priority is "informational". "verbose" is lower than that.
+    EXPECT_CALL(logger, log(_, _, _)).Times(0);
 
-  ALOG(LOG_VERBOSE, NULL, verbose);
+    ALOG(LOG_VERBOSE, NULL, verbose);
 }
 
 TEST_F(InputReport, info_message)
 {
     EXPECT_CALL(logger, log(
             ml::Logger::informational,
-            __PRETTY_FUNCTION__,
+            "[Foo]Some informational message",
             component));
 
-    ALOGI(__PRETTY_FUNCTION__);
+    ALOGI("Some informational message");
 }
 
 TEST_F(InputReport, warning_message)
 {
     EXPECT_CALL(logger, log(
             ml::Logger::warning,
-            __PRETTY_FUNCTION__,
+            "[Foo]Warning!!!",
             component));
 
-    ALOGW(__PRETTY_FUNCTION__);
+    ALOGW("Warning!!!");
 }
 
 TEST_F(InputReport, error_message)
 {
     EXPECT_CALL(logger, log(
             ml::Logger::error,
-            __PRETTY_FUNCTION__,
+            "[Foo]An error occurred!",
             component));
 
-    ALOGE(__PRETTY_FUNCTION__);
+    ALOGE("An error occurred!");
 }