1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2015-12-02 14:55:35 +0000
3
+++ CMakeLists.txt	2015-12-04 15:08:42 +0000
4
@@ -103,6 +103,9 @@
5
103
    # -fsanitize=thread is used, but doesn't.
103
    # -fsanitize=thread is used, but doesn't.
6
104
    #
104
    #
7
105
    # Linking everything with tsan is harmless and simple, so do that.
105
    # Linking everything with tsan is harmless and simple, so do that.
8
106
    if (CMAKE_VERSION VERSION_GREATER 3.2.1)
9
107
      cmake_policy(SET CMP0022 OLD)
10
108
    endif()
11
106
    link_libraries(tsan)
109
    link_libraries(tsan)
12
107
  endif()
110
  endif()
13
108
  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fsanitize=thread")
111
  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fsanitize=thread")
14
109
112
15
=== modified file 'cmake/FindGtestGmock.cmake'
16
--- cmake/FindGtestGmock.cmake	2015-09-09 18:37:28 +0000
17
+++ cmake/FindGtestGmock.cmake	2015-12-04 15:08:42 +0000
18
@@ -23,11 +23,18 @@
19
23
set(GTEST_CXX_FLAGS "-fPIC")
23
set(GTEST_CXX_FLAGS "-fPIC")
20
24
if (cmake_build_type_lower MATCHES "threadsanitizer")
24
if (cmake_build_type_lower MATCHES "threadsanitizer")
21
25
  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=thread")
25
  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=thread")
22
26
elseif (cmake_build_type_lower MATCHES "ubsanitizer")
23
27
  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=undefined")
24
26
endif()
28
endif()
25
27
29
26
28
set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS}")
30
set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS}")
27
29
list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
31
list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
28
30
list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
32
list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
29
33
if (cmake_build_type_lower MATCHES "threadsanitizer")
30
34
  #Skip compiler check, since if GCC is the compiler, we need to link against -ltsan
31
35
  #explicitly; specifying additional linker flags doesn't seem possible for external projects
32
36
  list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=1)
33
37
endif()
34
31
if (${CMAKE_CROSSCOMPILING})
38
if (${CMAKE_CROSSCOMPILING})
35
32
  if(DEFINED MIR_NDK_PATH)
39
  if(DEFINED MIR_NDK_PATH)
36
33
    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
40
    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
37
34
41
38
=== modified file 'cmake/MirCommon.cmake'
39
--- cmake/MirCommon.cmake	2015-10-07 02:34:05 +0000
40
+++ cmake/MirCommon.cmake	2015-12-04 15:08:42 +0000
41
@@ -67,16 +67,14 @@
42
67
  endif()
67
  endif()
43
68
68
44
69
  if(cmake_build_type_lower MATCHES "threadsanitizer")
69
  if(cmake_build_type_lower MATCHES "threadsanitizer")
47
70
    find_program(LLVM_SYMBOLIZER llvm-symbolizer-3.6)
70
    if (NOT CMAKE_COMPILER_IS_GNUCXX)
48
71
    if (LLVM_SYMBOLIZER)
71
      find_program(LLVM_SYMBOLIZER llvm-symbolizer-3.6)
49
72
      if (LLVM_SYMBOLIZER)
50
72
        set(TSAN_EXTRA_OPTIONS "external_symbolizer_path=${LLVM_SYMBOLIZER}")
73
        set(TSAN_EXTRA_OPTIONS "external_symbolizer_path=${LLVM_SYMBOLIZER}")
51
74
      endif()
52
73
    endif()
75
    endif()
53
74
    # Space after ${TSAN_EXTRA_OPTIONS} works around bug in TSAN env. variable parsing 
76
    # Space after ${TSAN_EXTRA_OPTIONS} works around bug in TSAN env. variable parsing 
54
75
    list(APPEND test_env "TSAN_OPTIONS=\"suppressions=${CMAKE_SOURCE_DIR}/tools/tsan-suppressions second_deadlock_stack=1 halt_on_error=1 history_size=7 ${TSAN_EXTRA_OPTIONS} \"")
77
    list(APPEND test_env "TSAN_OPTIONS=\"suppressions=${CMAKE_SOURCE_DIR}/tools/tsan-suppressions second_deadlock_stack=1 halt_on_error=1 history_size=7 ${TSAN_EXTRA_OPTIONS} \"")
55
76
    # TSan does not support multi-threaded fork
56
77
    # TSan may open fds so "surface_creation_does_not_leak_fds" will not work as written
57
78
    # TSan deadlocks when running StreamTransportTest/0.SendsFullMessagesWhenInterrupted - disable it until understood
58
79
    set(test_exclusion_filter "UnresponsiveClient.does_not_hang_server:DemoInProcessServerWithStubClientPlatform.surface_creation_does_not_leak_fds:StreamTransportTest/0.SendsFullMessagesWhenInterrupted:BufferQueue/WithTwoOrMoreBuffers.client_framerate_matches_compositor*:BufferQueue/WithThreeOrMoreBuffers.slow_client_framerate_matches_compositor*:BufferQueue/WithThreeOrMoreBuffers.queue_size_scales_with_client_performance*")
59
80
  endif()
78
  endif()
60
81
79
61
82
  if(SYSTEM_SUPPORTS_O_TMPFILE EQUAL 1)
80
  if(SYSTEM_SUPPORTS_O_TMPFILE EQUAL 1)
62
83
81
63
=== modified file 'tools/tsan-suppressions'
64
--- tools/tsan-suppressions	2015-07-17 05:46:53 +0000
65
+++ tools/tsan-suppressions	2015-12-04 15:08:42 +0000
66
@@ -1,7 +1,4 @@
67
1
race:libglib*
1
race:libglib*
68
2
race:libgio*
2
race:libgio*
69
3
race:testing::internal::FunctionMockerBase
3
race:testing::internal::FunctionMockerBase
74
4
race:~posix_event
4
race:std::__future_base::_State_baseV2::wait()
71
5
race:boost::asio::detail::posix_event::signal_and_unlock
72
6
#Suppress false positive when deleting main loop shared_ptr
73
7
race:std::__shared_ptr<mir::MainLoop, (__gnu_cxx::_Lock_policy)2>::operator->()
75
8
\ No newline at end of file
5
\ No newline at end of file
Reviewer	Review Type	Date Requested	Status
Alexandros Frantzis (community)		2015-12-03	Approve on 2015-12-07
Alan Griffiths			Approve on 2015-12-07
Daniel van Vugt			Approve on 2015-12-07
PS Jenkins bot (community)	continuous-integration		Approve on 2015-12-04
Review via email: mp+279533@code.launchpad.net