Commit 66d376d7 authored by Sigurdur Asgeirsson's avatar Sigurdur Asgeirsson Committed by Commit Bot

PM: Use DEATH_TEST_IF_SUPPORTED to work around test failures.

Also use an empty match regexpr for maximal compliance with output.

Bug: 996826
Change-Id: I8aaf27cc561752a6f202fed44b9f41f529b00aa4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1768858Reviewed-by: default avatarSébastien Marchand <sebmarchand@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689946}
parent 811b4034
......@@ -54,7 +54,7 @@ TEST_F(FrameNodeImplDeathTest, SafeDowncast) {
auto process = CreateNode<ProcessNodeImpl>();
auto page = CreateNode<PageNodeImpl>();
auto frame = CreateNode<FrameNodeImpl>(process.get(), page.get());
ASSERT_DEATH(PageNodeImpl::FromNodeBase(frame.get()), "Check failed: .*");
ASSERT_DEATH_IF_SUPPORTED(PageNodeImpl::FromNodeBase(frame.get()), "");
}
TEST_F(FrameNodeImplTest, AddFrameHierarchyBasic) {
......
......@@ -54,7 +54,7 @@ using PageNodeImplDeathTest = PageNodeImplTest;
TEST_F(PageNodeImplDeathTest, SafeDowncast) {
auto page = CreateNode<PageNodeImpl>();
ASSERT_DEATH(FrameNodeImpl::FromNodeBase(page.get()), "Check failed: .*");
ASSERT_DEATH_IF_SUPPORTED(FrameNodeImpl::FromNodeBase(page.get()), "");
}
TEST_F(PageNodeImplTest, AddFrameBasic) {
......
......@@ -33,7 +33,7 @@ using ProcessNodeImplDeathTest = ProcessNodeImplTest;
TEST_F(ProcessNodeImplDeathTest, SafeDowncast) {
auto process = CreateNode<ProcessNodeImpl>();
ASSERT_DEATH(FrameNodeImpl::FromNodeBase(process.get()), "Check failed: .*");
ASSERT_DEATH_IF_SUPPORTED(FrameNodeImpl::FromNodeBase(process.get()), "");
}
TEST_F(ProcessNodeImplTest, MeasureCPUUsage) {
......
......@@ -62,7 +62,7 @@ using SystemNodeImplDeathTest = SystemNodeImplTest;
TEST_F(SystemNodeImplDeathTest, SafeDowncast) {
auto system = CreateNode<SystemNodeImpl>();
ASSERT_DEATH(PageNodeImpl::FromNodeBase(system.get()), "Check failed: .*");
ASSERT_DEATH_IF_SUPPORTED(PageNodeImpl::FromNodeBase(system.get()), "");
}
namespace {
......
......@@ -41,7 +41,7 @@ TEST_F(WorkerNodeImplDeathTest, SafeDowncast) {
auto process = CreateNode<ProcessNodeImpl>();
auto worker = CreateNode<WorkerNodeImpl>(WorkerNode::WorkerType::kDedicated,
process.get());
ASSERT_DEATH(FrameNodeImpl::FromNodeBase(worker.get()), "Check failed: .*");
ASSERT_DEATH_IF_SUPPORTED(FrameNodeImpl::FromNodeBase(worker.get()), "");
}
// Create a worker of each type and register the frame as a client of each.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment