Commit b304319f authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

remove valgrind checks from //gpu

We have not supported valgrind for some time (it was never ported to
the GN build IIUC, and has been obsoleted by ASan/MSan/TSan).

BUG=791518

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I0948b46f523be2a28894306b9377646d111c22a8
Reviewed-on: https://chromium-review.googlesource.com/809131Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Reviewed-by: default avatarAbhishek Arya <inferno@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#522042}
parent d02cdc58
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "build/build_config.h" #include "build/build_config.h"
...@@ -134,12 +133,8 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, ...@@ -134,12 +133,8 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
} }
#endif // OS_ANDROID #endif // OS_ANDROID
// In addition to disabling the watchdog if the command line switch is
// present, disable the watchdog on valgrind because the code is expected
// to run slowly in that case.
bool enable_watchdog = !gpu_preferences.disable_gpu_watchdog && bool enable_watchdog = !gpu_preferences.disable_gpu_watchdog &&
!command_line->HasSwitch(switches::kHeadless) && !command_line->HasSwitch(switches::kHeadless);
!RunningOnValgrind();
// Disable the watchdog in debug builds because they tend to only be run by // Disable the watchdog in debug builds because they tend to only be run by
// developers who will not appreciate the watchdog killing the GPU process. // developers who will not appreciate the watchdog killing the GPU process.
......
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