Commit 15839050 authored by Caleb Rouleau's avatar Caleb Rouleau

[go/perfbot-sheriff][base_perftests] Properly disable NotifyPerformance

This change should be committed right away per go/perfbot-sheriff
since this is failing on the waterfall.

r610618 didn't work since
TYPED_TEST(ObserverListPerfTest, MAYBE_NotifyPerformance) {
is preprocessed to
something_MAYBE_NotifyPerformance
So then the directive
#define MAYBE_NotifyPerformance DISABLED_NotifyPerformance
is not applied.

This will fix both 908490 and 906686.

Bug: 906686,908490
Change-Id: Ib2adc016fbef79bb889a076e452534f893fb09b5
Reviewed-on: https://chromium-review.googlesource.com/c/1352481Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarJohn Rummell <jrummell@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611397}
parent c6a76075
...@@ -64,11 +64,10 @@ TYPED_TEST_CASE(ObserverListPerfTest, ObserverTypes); ...@@ -64,11 +64,10 @@ TYPED_TEST_CASE(ObserverListPerfTest, ObserverTypes);
// Performance test for base::ObserverList and Checked Observers. // Performance test for base::ObserverList and Checked Observers.
// Times out on Android (crbug.com/906686). // Times out on Android (crbug.com/906686).
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#define MAYBE_NotifyPerformance DISABLED_NotifyPerformance TYPED_TEST(ObserverListPerfTest, DISABLED_NotifyPerformance) {
#else #else
#define MAYBE_NotifyPerformance NotifyPerformance TYPED_TEST(ObserverListPerfTest, NotifyPerformance) {
#endif #endif
TYPED_TEST(ObserverListPerfTest, MAYBE_NotifyPerformance) {
constexpr int kMaxObservers = 128; constexpr int kMaxObservers = 128;
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
// The test takes about 100x longer in debug builds, mostly due to sequence // The test takes about 100x longer in debug builds, mostly due to sequence
......
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