Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: runtime/vm/snapshot_test.cc

Issue 2718523003: Fixed issue in MallocHooks where a MallocHookScope was accidentally removed during a merge, causing… (Closed)
Patch Set: Fixed issue in MallocHooks where a MallocHookScope was accidentally removed during a merge, causing… Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/service.cc ('k') | runtime/vm/source_report.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/snapshot_test.cc
diff --git a/runtime/vm/snapshot_test.cc b/runtime/vm/snapshot_test.cc
index a910b54589747513225431ad0d48cab2c5e8fc65..41953ecee96db15980da18dc1804dd51070268e1 100644
--- a/runtime/vm/snapshot_test.cc
+++ b/runtime/vm/snapshot_test.cc
@@ -12,6 +12,7 @@
#include "vm/dart_api_message.h"
#include "vm/dart_api_state.h"
#include "vm/flags.h"
+#include "vm/malloc_hooks.h"
#include "vm/snapshot.h"
#include "vm/symbols.h"
#include "vm/unicode.h"
@@ -1122,6 +1123,11 @@ static void IterateScripts(const Library& lib) {
}
ISOLATE_UNIT_TEST_CASE(GenerateSource) {
+ // Disable stack trace collection for this test as it results in a timeout.
+ bool stack_trace_collection_enabled =
+ MallocHooks::stack_trace_collection_enabled();
+ MallocHooks::set_stack_trace_collection_enabled(false);
+
Zone* zone = thread->zone();
Isolate* isolate = thread->isolate();
const GrowableObjectArray& libs =
@@ -1135,6 +1141,9 @@ ISOLATE_UNIT_TEST_CASE(GenerateSource) {
OS::Print("Generating source for library: %s\n", uri.ToCString());
IterateScripts(lib);
}
+
+ MallocHooks::set_stack_trace_collection_enabled(
+ stack_trace_collection_enabled);
}
« no previous file with comments | « runtime/vm/service.cc ('k') | runtime/vm/source_report.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698