Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tests: Make LTTNG fork()-safe #1496

Merged
merged 2 commits into from Jun 1, 2020
Merged

Tests: Make LTTNG fork()-safe #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16e8081
Add missing GMock include for EXPECT_THAT
RAOF Jun 1, 2020
266aa80
Tests: Make LTTNG fork()-safe.
RAOF Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmake/MirCommon.cmake
View file
Open in desktop
Expand Up @@ -98,6 +98,10 @@ function (mir_discover_tests_internal EXECUTABLE TEST_ENV_OPTIONS DETECT_FD_LEAK
set(test_exclusion_filter "${test_exclusion_filter}:AnonymousShmFile.*:MesaBufferAllocatorTest.software_buffers_dont_bypass:MesaBufferAllocatorTest.creates_software_rendering_buffer")
endif()

# liblttng-ust is unsafe if you fork() without exec(), such as we do in the test suite
# We need to load liblttng-ust-fork.so to make this work reliably.
list(APPEND test_env "LD_PRELOAD=liblttng-ust-fork.so")

# Final commands
set(test_cmd "${test_cmd}" "--gtest_filter=-${test_no_memcheck_filter}:${test_exclusion_filter}")
set(test_cmd_no_memcheck "${test_cmd_no_memcheck}" "--gtest_death_test_style=threadsafe" "--gtest_filter=${test_no_memcheck_filter}:-${test_exclusion_filter}")
Expand Down
1 change: 1 addition & 0 deletions tests/unit-tests/graphics/test_display_configuration.cpp
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@
#include "mir/graphics/display_configuration.h"

#include <gtest/gtest.h>
#include <gmock/gmock.h>

namespace mg = mir::graphics;
namespace geom = mir::geometry;
Expand Down