Merge lp:~vanvugt/mir/clang into lp:~mir-team/mir/trunk

[Daniel van Vugt]

Add support for compiling Mir with Clang.

Caveats:
  * Clang 3.1 or later is required (raring or later).
  * Input does not compile yet, due to deep problems with the boost/android-
    input headers.
  * Tests fail when built with clang. Fix them later...

How to build with clang:
  cmake .. -DCMAKE_C_COMPILER=clang \
           -DCMAKE_CXX_COMPILER=clang++ \
           -DMIR_DISABLE_INPUT=ON

This also resolves LP: #1152625.

If you see something strange and don't understand "why", try building with clang and undoing the change by hand. Clang will tell you "why".

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/mir-ci/93/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/94/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/94/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/93/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Alexandros Frantzis (afrantzis)]

616 - Displacement const disp;
617 + Displacement disp;
... and Point and Rectangle

The error is "default initialization of an object of const type '...' requires a user-provided default constructor"

I'd rather we didn't drop const and value initialize instead:

Displacement const disp{};

Alternatively we could provide appropriate constructors:

Displacement() {}
Displacement(DeltaX const& dx, DeltaY const& dy) : dx{dx}, dy{dy} {}

Note that in gcc we don't see this because gcc "allows const objects with no initializer or user-provided default constructor if the defaulted constructor initializes all the subobjects.", which IMHO, is what should have been in the standard in the first place... (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42844)

review: Needs Fixing

[Kevin DuBois (kdub)]

seems ok. doesn't break android gcc cross build. I wouldn't expect clang to work to build for armhf for android with this branch alone. That being said, i'll +1, pending alexandros's comments

review: Approve

[Alan Griffiths (alan-griffiths)]

> 616 - Displacement const disp;
> 617 + Displacement disp;
> ... and Point and Rectangle
>
> The error is "default initialization of an object of const type '...' requires
> a user-provided default constructor"
>
> I'd rather we didn't drop const and value initialize instead:
>
> Displacement const disp{};
>
> Alternatively we could provide appropriate constructors:
>
> Displacement() {}
> Displacement(DeltaX const& dx, DeltaY const& dy) : dx{dx}, dy{dy} {}
>
> Note that in gcc we don't see this because gcc "allows const objects with no
> initializer or user-provided default constructor if the defaulted constructor
> initializes all the subobjects.", which IMHO, is what should have been in the
> standard in the first place... (see
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42844)

I'm convinced

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Tried Alexandros' suggestion of "Foo const bar{}". Clang likes it, but gcc does not:
test-point.cpp:39:30: error: missing initializer for member ‘mir::geometry::Point::x’ [-Werror=missing-field-initializers]

"Foo bar;" is still the most elegant way to support both compilers. I don't think const-ness in test cases justifies polluting otherwise simple struct definitions with explicit constructors. So keeping it as it was.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/mir-ci/123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/28/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/124/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/124/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/123/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

> Clang likes it, but gcc does not:
> test-point.cpp:39:30: error: missing initializer for member ‘mir::geometry::Point::x’ [-Werror=missing-field-initializers]

Sigh... http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55805

How about:

Displacement const disp = Displacement();

[Daniel van Vugt (vanvugt)]

I don't think:
    Displacement const disp = Displacement();
is a good alternative. Doesn't that create a non-const temporary anyway?

[Alexandros Frantzis (afrantzis)]

> I don't think:
> Displacement const disp = Displacement();
> is a good alternative. Doesn't that create a non-const temporary anyway?

Depends on the compiler. I expect that the compiler is able to elide the copy and use of a temporary object.

But even if there is a non-const temporary involved, I don't see a problem; we don't (or have any way to) access this temporary object.

[Daniel van Vugt (vanvugt)]

I think we're wasting time here.

At the binary level, both:
  Displacement const disp;
and
  Displacement disp;
are identical.

Only the latter works with both gcc and clang compilers. And although you could possibly make the expression more complex to keep the variable const, that would contradict the intention of the test cases in question -- to represent a completely uninitialized object.

Since the intention of this code is to test what happens to uninitialized objects, I think it would be preferable to avoid assignment. Regardless of assumptions about what might get optimized out.

[Alan Griffiths (alan-griffiths)]

> I think we're wasting time here.
>
> At the binary level, both:
> Displacement const disp;
> and
> Displacement disp;
> are identical.

And, with any sane compiler so is:

Displacement const disp = Displacement();
auto const disp = Displacement();
auto const& disp = Displacement();

etc.

[Alan Griffiths (alan-griffiths)]

I'd mildly prefer "auto const& disp = Displacement();" but not worth blocking on.

review: Approve

[Alexandros Frantzis (afrantzis)]

> intention of the test cases in question -- to represent a completely uninitialized object.

The intention is to verify that default-initialization, which has the same effect as value-initialization for the structs under discussion, is producing sane values.

[Robert Carr (robertcarr)]

Clang!

review: Approve

[Kevin DuBois (kdub)]

still a +1 from before the resubmittal

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-15 22:34:53 +0000
+++ CMakeLists.txt	2013-03-19 03:30:28 +0000
@@ -24,8 +24,13 @@
 )
 cmake_policy(SET CMP0015 NEW)
 
-set(CMAKE_C_COMPILER gcc-${MIR_GCC_VERSION})
-set(CMAKE_CXX_COMPILER g++-${MIR_GCC_VERSION})
+if (NOT DEFINED CMAKE_C_COMPILER)
+  set (CMAKE_C_COMPILER gcc-${MIR_GCC_VERSION})
+endif ()
+if (NOT DEFINED CMAKE_CXX_COMPILER)
+  set (CMAKE_CXX_COMPILER g++-${MIR_GCC_VERSION})
+endif ()
+
 set(CMAKE_GCOV gcov-${MIR_GCC_VERSION})
 
 project(Mir)
@@ -169,6 +174,10 @@
 add_subdirectory(src/)
 include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})
 
+set (OLD_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+# Don't treat warnings as errors in 3rd_party/{gmock,cucumber-cpp}
+string (REPLACE " -Werror " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+
 # Pulling in local gmock version
 # While this seems evil, we are doing
 # it to ensure/allow for:
@@ -195,6 +204,10 @@
 )
 # We need to build cucumber after gtest
 add_subdirectory(3rd_party/cucumber-cpp)
+
+# Restore -Werror for non-3rd-party code
+set (CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
+
 add_subdirectory(benchmarks/)
 add_subdirectory(tests/)
 add_subdirectory(tools/)

=== modified file 'cmake/src/mir/mir_discover_gtest_tests.cpp'
--- cmake/src/mir/mir_discover_gtest_tests.cpp	2013-03-08 07:20:43 +0000
+++ cmake/src/mir/mir_discover_gtest_tests.cpp	2013-03-19 03:30:28 +0000
@@ -52,11 +52,6 @@
     return width;
 }
 
-std::string& ltrim(std::string &s) {
-        s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
-        return s;
-}
-
 string ordinary_cmd_line_pattern()
 {
     static const char* pattern = "ADD_TEST(\"%s.%s\" \"%s\" \"--gtest_filter=%s\")\n";
@@ -89,22 +84,6 @@
     return ss.str();
 }
 
-std::string elide_string_right(const std::string& in, std::size_t max_size)
-{
-    assert(max_size >= 3);
-
-    std::string result(in.begin(), in.begin() + max_size);
-
-    if (in.size() >= max_size)
-    {
-        *(result.end()-1) = '.';
-        *(result.end()-2) = '.';
-        *(result.end()-3) = '.';
-    }
-
-    return result;
-}
-
 std::string elide_string_left(const std::string& in, std::size_t max_size)
 {
     assert(max_size >= 3);

=== modified file 'examples/image_renderer.cpp'
--- examples/image_renderer.cpp	2013-01-02 12:16:08 +0000
+++ examples/image_renderer.cpp	2013-03-19 03:30:28 +0000
@@ -18,7 +18,11 @@
 
 #include "image_renderer.h"
 
+// Unfortunately we have to ignore warnings/errors in 3rd party code.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic warning "-Wall"
 #include <glm/glm.hpp>
+#pragma GCC diagnostic pop
 #include <glm/gtc/type_ptr.hpp>
 
 #include <memory>

=== modified file 'include/server/mir/compositor/buffer.h'
--- include/server/mir/compositor/buffer.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/compositor/buffer.h	2013-03-19 03:30:28 +0000
@@ -27,7 +27,7 @@
 {
 namespace compositor
 {
-class BufferIPCPackage;
+struct BufferIPCPackage;
 class BufferID;
 
 class Buffer : public surfaces::GraphicRegion

=== modified file 'include/server/mir/compositor/buffer_allocation_strategy.h'
--- include/server/mir/compositor/buffer_allocation_strategy.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/compositor/buffer_allocation_strategy.h	2013-03-19 03:30:28 +0000
@@ -31,7 +31,7 @@
 {
 class GraphicBufferAllocator;
 class BufferSwapper;
-class BufferProperties;
+struct BufferProperties;
 
 class BufferAllocationStrategy
 {

=== modified file 'include/server/mir/compositor/buffer_bundle_manager.h'
--- include/server/mir/compositor/buffer_bundle_manager.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/compositor/buffer_bundle_manager.h	2013-03-19 03:30:28 +0000
@@ -33,7 +33,7 @@
 
 class BufferAllocationStrategy;
 class GraphicBufferAllocator;
-class BufferProperties;
+struct BufferProperties;
 
 class BufferBundleManager : public surfaces::BufferBundleFactory
 {

=== modified file 'include/server/mir/compositor/buffer_bundle_surfaces.h'
--- include/server/mir/compositor/buffer_bundle_surfaces.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/compositor/buffer_bundle_surfaces.h	2013-03-19 03:30:28 +0000
@@ -30,7 +30,7 @@
 {
 
 class BufferIDUniqueGenerator;
-class BufferProperties;
+struct BufferProperties;
 class BufferSwapper;
 
 class BufferBundleSurfaces : public surfaces::BufferBundle

=== modified file 'include/server/mir/compositor/graphic_buffer_allocator.h'
--- include/server/mir/compositor/graphic_buffer_allocator.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/compositor/graphic_buffer_allocator.h	2013-03-19 03:30:28 +0000
@@ -29,7 +29,7 @@
 namespace compositor
 {
 
-class BufferProperties;
+struct BufferProperties;
 
 class GraphicBufferAllocator
 {

=== modified file 'include/server/mir/compositor/swapper_factory.h'
--- include/server/mir/compositor/swapper_factory.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/compositor/swapper_factory.h	2013-03-19 03:30:28 +0000
@@ -27,7 +27,7 @@
 {
 
 class GraphicBufferAllocator;
-class BufferProperties;
+struct BufferProperties;
 
 class SwapperFactory : public BufferAllocationStrategy
 {

=== modified file 'include/server/mir/frontend/shell.h'
--- include/server/mir/frontend/shell.h	2013-03-15 23:15:45 +0000
+++ include/server/mir/frontend/shell.h	2013-03-19 03:30:28 +0000
@@ -28,7 +28,7 @@
 namespace frontend
 {
 class Session;
-class SurfaceCreationParameters;
+struct SurfaceCreationParameters;
 
 class Shell
 {

=== modified file 'include/server/mir/graphics/platform.h'
--- include/server/mir/graphics/platform.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/graphics/platform.h	2013-03-19 03:30:28 +0000
@@ -36,7 +36,7 @@
 {
 
 class Display;
-class PlatformIPCPackage;
+struct PlatformIPCPackage;
 class BufferInitializer;
 
 class DisplayReport;

=== modified file 'include/server/mir/graphics/renderable.h'
--- include/server/mir/graphics/renderable.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/graphics/renderable.h	2013-03-19 03:30:28 +0000
@@ -22,7 +22,12 @@
 #include "mir/geometry/point.h"
 #include "mir/geometry/size.h"
 #include <memory>
+
+// Unfortunately we have to ignore warnings/errors in 3rd party code.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic warning "-Wall"
 #include <glm/glm.hpp>
+#pragma GCC diagnostic pop
 
 namespace mir
 {

=== modified file 'include/server/mir/shell/session_manager.h'
--- include/server/mir/shell/session_manager.h	2013-03-15 23:15:45 +0000
+++ include/server/mir/shell/session_manager.h	2013-03-19 03:30:28 +0000
@@ -30,7 +30,7 @@
 {
 namespace frontend
 {
-class SurfaceCreationParameters;
+struct SurfaceCreationParameters;
 }
 
 /// Management of sessions and surfaces

=== modified file 'include/server/mir/shell/surface_builder.h'
--- include/server/mir/shell/surface_builder.h	2013-03-18 15:13:28 +0000
+++ include/server/mir/shell/surface_builder.h	2013-03-19 03:30:28 +0000
@@ -24,7 +24,7 @@
 
 namespace mir
 {
-namespace frontend { class SurfaceCreationParameters; }
+namespace frontend { struct SurfaceCreationParameters; }
 namespace surfaces { class Surface; }
 
 namespace shell

=== modified file 'include/server/mir/surfaces/buffer_bundle_factory.h'
--- include/server/mir/surfaces/buffer_bundle_factory.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/surfaces/buffer_bundle_factory.h	2013-03-19 03:30:28 +0000
@@ -27,7 +27,7 @@
 {
 namespace compositor
 {
-class BufferProperties;
+struct BufferProperties;
 }
 
 namespace surfaces

=== modified file 'include/server/mir/surfaces/surface_stack.h'
--- include/server/mir/surfaces/surface_stack.h	2013-03-18 15:13:28 +0000
+++ include/server/mir/surfaces/surface_stack.h	2013-03-19 03:30:28 +0000
@@ -37,7 +37,7 @@
 
 namespace frontend
 {
-class SurfaceCreationParameters;
+struct SurfaceCreationParameters;
 }
 
 /// Management of Surface objects. Includes the model (SurfaceStack and Surface

=== modified file 'include/server/mir/surfaces/surface_stack_model.h'
--- include/server/mir/surfaces/surface_stack_model.h	2013-03-15 22:34:53 +0000
+++ include/server/mir/surfaces/surface_stack_model.h	2013-03-19 03:30:28 +0000
@@ -25,7 +25,7 @@
 {
 namespace frontend
 {
-class SurfaceCreationParameters;
+struct SurfaceCreationParameters;
 }
 
 namespace surfaces

=== modified file 'include/shared/mir/geometry/forward.h'
--- include/shared/mir/geometry/forward.h	2013-03-07 08:04:05 +0000
+++ include/shared/mir/geometry/forward.h	2013-03-19 03:30:28 +0000
@@ -24,10 +24,10 @@
 namespace geometry
 {
 // Declarations of geometric concepts I think we'll need
-class Point;
-class Size;
+struct Point;
+struct Size;
 class Displacement;
-class Rectangle;
+struct Rectangle;
 class Region;
 }
 }

=== modified file 'src/client/client_buffer.h'
--- src/client/client_buffer.h	2013-03-07 08:04:05 +0000
+++ src/client/client_buffer.h	2013-03-19 03:30:28 +0000
@@ -28,7 +28,7 @@
 
 namespace mir_toolkit
 {
-class MirBufferPackage;
+struct MirBufferPackage;
 }
 
 namespace mir

=== modified file 'src/client/client_buffer_depository.h'
--- src/client/client_buffer_depository.h	2013-03-07 08:04:05 +0000
+++ src/client/client_buffer_depository.h	2013-03-19 03:30:28 +0000
@@ -26,7 +26,7 @@
 
 namespace mir_toolkit
 {
-class MirBufferPackage;
+struct MirBufferPackage;
 }
 namespace mir
 {

=== modified file 'src/client/client_context.h'
--- src/client/client_context.h	2013-03-07 08:04:05 +0000
+++ src/client/client_context.h	2013-03-19 03:30:28 +0000
@@ -21,8 +21,8 @@
 
 namespace mir_toolkit
 {
-class MirPlatformPackage;
-class MirConnection;
+struct MirPlatformPackage;
+struct MirConnection;
 }
 
 namespace mir

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2013-03-07 08:04:05 +0000
+++ src/client/mir_connection.h	2013-03-19 03:30:28 +0000
@@ -44,7 +44,7 @@
 }
 }
 
-class mir_toolkit::MirConnection : public mir::client::ClientContext
+struct mir_toolkit::MirConnection : public mir::client::ClientContext
 {
 public:
     MirConnection();

=== modified file 'src/client/mir_surface.h'
--- src/client/mir_surface.h	2013-03-07 08:04:05 +0000
+++ src/client/mir_surface.h	2013-03-19 03:30:28 +0000
@@ -35,11 +35,11 @@
 namespace client
 {
 class ClientBuffer;
-class MemoryRegion;
+struct MemoryRegion;
 }
 }
 
-class mir_toolkit::MirSurface : public mir::client::ClientSurface
+struct mir_toolkit::MirSurface : public mir::client::ClientSurface
 {
 public:
     MirSurface(MirSurface const &) = delete;

=== modified file 'src/client/mir_wait_handle.h'
--- src/client/mir_wait_handle.h	2013-03-08 07:20:43 +0000
+++ src/client/mir_wait_handle.h	2013-03-19 03:30:28 +0000
@@ -25,7 +25,7 @@
 
 namespace mir_toolkit
 {
-class MirWaitHandle
+struct MirWaitHandle
 {
 public:
     MirWaitHandle();

=== modified file 'src/server/frontend/protobuf_socket_communicator.h'
--- src/server/frontend/protobuf_socket_communicator.h	2013-03-07 08:04:05 +0000
+++ src/server/frontend/protobuf_socket_communicator.h	2013-03-19 03:30:28 +0000
@@ -25,6 +25,7 @@
 
 #include <boost/asio.hpp>
 
+#include <atomic>
 #include <thread>
 #include <string>
 #include <vector>
@@ -47,7 +48,7 @@
 
 namespace detail
 {
-class SocketSession;
+struct SocketSession;
 }
 
 class ProtobufSocketCommunicator : public Communicator

=== modified file 'src/server/graphics/gbm/gbm_buffer_allocator.h'
--- src/server/graphics/gbm/gbm_buffer_allocator.h	2013-03-07 08:04:05 +0000
+++ src/server/graphics/gbm/gbm_buffer_allocator.h	2013-03-19 03:30:28 +0000
@@ -34,7 +34,7 @@
 {
 
 class GBMPlatform;
-class EGLExtensions;
+struct EGLExtensions;
 
 class GBMBufferAllocator: public compositor::GraphicBufferAllocator
 {

=== modified file 'src/server/graphics/gbm/gbm_display.h'
--- src/server/graphics/gbm/gbm_display.h	2013-03-07 08:04:05 +0000
+++ src/server/graphics/gbm/gbm_display.h	2013-03-19 03:30:28 +0000
@@ -30,7 +30,7 @@
 {
 namespace geometry
 {
-class Rectangle;
+struct Rectangle;
 }
 namespace graphics
 {

=== modified file 'src/server/graphics/gbm/gbm_display_buffer.cpp'
--- src/server/graphics/gbm/gbm_display_buffer.cpp	2013-03-07 08:04:05 +0000
+++ src/server/graphics/gbm/gbm_display_buffer.cpp	2013-03-19 03:30:28 +0000
@@ -71,14 +71,6 @@
     delete bufobj;
 }
 
-void page_flip_handler(int /*fd*/, unsigned int /*frame*/,
-                       unsigned int /*sec*/, unsigned int /*usec*/,
-                       void* data)
-{
-    auto page_flip_pending = static_cast<int*>(data);
-    --(*page_flip_pending);
-}
-
 void ensure_egl_image_extensions()
 {
     std::string ext_string;

=== modified file 'src/server/graphics/gbm/gbm_display_helpers.h'
--- src/server/graphics/gbm/gbm_display_helpers.h	2013-03-07 08:04:05 +0000
+++ src/server/graphics/gbm/gbm_display_helpers.h	2013-03-19 03:30:28 +0000
@@ -25,7 +25,7 @@
 #include <memory>
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-pedantic"  // Ignore bad syntax in gbm.h
+#pragma GCC diagnostic warning "-Wall"
 #include <gbm.h>
 #pragma GCC diagnostic pop
 

=== modified file 'src/server/graphics/gbm/kms_display_configuration.cpp'
--- src/server/graphics/gbm/kms_display_configuration.cpp	2013-03-07 08:04:05 +0000
+++ src/server/graphics/gbm/kms_display_configuration.cpp	2013-03-19 03:30:28 +0000
@@ -60,7 +60,6 @@
 }
 
 mgg::KMSDisplayConfiguration::KMSDisplayConfiguration(int drm_fd)
-    : drm_fd{drm_fd}
 {
     DRMModeResources resources{drm_fd};
 

=== modified file 'src/server/graphics/gbm/kms_display_configuration.h'
--- src/server/graphics/gbm/kms_display_configuration.h	2013-03-07 08:04:05 +0000
+++ src/server/graphics/gbm/kms_display_configuration.h	2013-03-19 03:30:28 +0000
@@ -47,7 +47,6 @@
 private:
     void add_output(DRMModeResources const& resources, drmModeConnector const& connector);
 
-    int const drm_fd;
     std::vector<DisplayConfigurationOutput> outputs;
 };
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-03-14 21:29:14 +0000
+++ tests/CMakeLists.txt	2013-03-19 03:30:28 +0000
@@ -16,6 +16,12 @@
   ON
 )
 
+if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
+  # Avoid clang complaints about poor quality gmock/gtest/cucumber headers
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=null-dereference")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=overloaded-virtual")
+endif ()
+
 if(MIR_ENABLE_DEATH_TESTS)
   add_definitions(-DMIR_DEATH_TESTS_ENABLED)
 endif(MIR_ENABLE_DEATH_TESTS)

=== modified file 'tests/death-tests/test_application_manager_death.cpp'
--- tests/death-tests/test_application_manager_death.cpp	2013-03-07 08:04:05 +0000
+++ tests/death-tests/test_application_manager_death.cpp	2013-03-19 03:30:28 +0000
@@ -30,10 +30,11 @@
 //  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
 // leads to the test failing under valgrind
     EXPECT_EXIT(
-                mir::shell::SessionManager app(std::shared_ptr<msh::SurfaceFactory>(),
-                                                  std::shared_ptr<msh::SessionContainer>(),
-                                                  std::shared_ptr<msh::FocusSequence>(),
-                                                  std::shared_ptr<msh::FocusSetter>()),
+                std::shared_ptr<msh::SurfaceFactory> factory;
+                mir::shell::SessionManager app(factory,
+                                               std::shared_ptr<msh::SessionContainer>(),
+                                               std::shared_ptr<msh::FocusSequence>(),
+                                               std::shared_ptr<msh::FocusSetter>()),
                 ::testing::KilledBySignal(SIGABRT),
                 ".*");
 }

=== modified file 'tests/integration-tests/test_drm_auth_magic.cpp'
--- tests/integration-tests/test_drm_auth_magic.cpp	2013-03-07 08:04:05 +0000
+++ tests/integration-tests/test_drm_auth_magic.cpp	2013-03-19 03:30:28 +0000
@@ -147,7 +147,7 @@
 TEST_F(BespokeDisplayServerTestFixture, drm_auth_magic_platform_error_reaches_client)
 {
     unsigned int const magic{0x10111213};
-    int const auth_magic_error{667};
+    static int const auth_magic_error{667};
 
     struct ServerConfig : TestingServerConfiguration
     {

=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2013-03-07 08:04:05 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2013-03-19 03:30:28 +0000
@@ -248,8 +248,7 @@
 
     struct ServerConfig : TestingServerConfiguration
     {
-        std::shared_ptr<mc::BufferAllocationStrategy> the_buffer_allocation_strategy(
-                std::shared_ptr<mc::GraphicBufferAllocator> const& /*buffer_allocator*/)
+        std::shared_ptr<mc::BufferAllocationStrategy> the_buffer_allocation_strategy()
         {
             using namespace testing;
 

=== modified file 'tests/mir_test_framework/testing_process_manager.cpp'
--- tests/mir_test_framework/testing_process_manager.cpp	2013-03-12 03:50:42 +0000
+++ tests/mir_test_framework/testing_process_manager.cpp	2013-03-19 03:30:28 +0000
@@ -31,18 +31,6 @@
 namespace mc = mir::compositor;
 namespace mtf = mir_test_framework;
 
-namespace
-{
-::testing::AssertionResult WasStarted(
-    std::shared_ptr<mtf::Process> const& server_process)
-{
-    if (server_process)
-        return ::testing::AssertionSuccess() << "server started";
-    else
-        return ::testing::AssertionFailure() << "server NOT started";
-}
-}
-
 namespace mir_test_framework
 {
 void startup_pause()
@@ -96,15 +84,11 @@
         signal_display_server = &server;
 
         {
-            struct ScopedFuture
-            {
-                std::future<void> future;
-                ~ScopedFuture() { future.wait(); }
-            } scoped;
-
-            scoped.future = std::async(std::launch::async, std::bind(&mir::DisplayServer::run, &server));
+            std::future<void> future = std::async(std::launch::async, std::bind(&mir::DisplayServer::run, &server));
 
             config.exec(&server);
+
+            future.wait();
         }
 
         config.on_exit(&server);

=== modified file 'tests/unit-tests/geometry/test-displacement.cpp'
--- tests/unit-tests/geometry/test-displacement.cpp	2012-09-18 12:09:56 +0000
+++ tests/unit-tests/geometry/test-displacement.cpp	2013-03-19 03:30:28 +0000
@@ -26,7 +26,7 @@
 TEST(geometry, displacement)
 {
     using namespace geom;
-    Displacement const disp;
+    Displacement disp;
     Displacement const dx2dy4{DeltaX{2}, DeltaY{4}};
 
     EXPECT_EQ(DeltaX{0}, disp.dx);

=== modified file 'tests/unit-tests/geometry/test-point.cpp'
--- tests/unit-tests/geometry/test-point.cpp	2012-09-18 10:35:52 +0000
+++ tests/unit-tests/geometry/test-point.cpp	2013-03-19 03:30:28 +0000
@@ -36,7 +36,7 @@
     EXPECT_EQ(Y(4), copy.y);
     EXPECT_EQ(pointx2y4, copy);
 
-    Point const defaultValue;
+    Point defaultValue;
     EXPECT_EQ(X(0), defaultValue.x);
     EXPECT_EQ(Y(0), defaultValue.y);
     EXPECT_NE(pointx2y4, defaultValue);

=== modified file 'tests/unit-tests/geometry/test-rectangle.cpp'
--- tests/unit-tests/geometry/test-rectangle.cpp	2012-09-18 12:26:17 +0000
+++ tests/unit-tests/geometry/test-rectangle.cpp	2013-03-19 03:30:28 +0000
@@ -38,7 +38,7 @@
     EXPECT_EQ(w2h4, copy.size);
     EXPECT_EQ(rect, copy);
 
-    Rectangle const default_rect;
+    Rectangle default_rect;
     EXPECT_EQ(Point(), default_rect.top_left);
     EXPECT_EQ(Size(), default_rect.size);
     EXPECT_NE(rect, default_rect);

=== modified file 'tests/unit-tests/graphics/gbm/mock_gbm.h'
--- tests/unit-tests/graphics/gbm/mock_gbm.h	2013-01-31 09:56:11 +0000
+++ tests/unit-tests/graphics/gbm/mock_gbm.h	2013-03-19 03:30:28 +0000
@@ -22,7 +22,7 @@
 #include <gmock/gmock.h>
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-pedantic"  // Ignore bad syntax in gbm.h
+#pragma GCC diagnostic warning "-Wall"
 #include <gbm.h>
 #pragma GCC diagnostic pop