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

Side by Side Diff: gin/test/file_runner.cc

Issue 1164483003: Allow startup with missing V8 snapshot file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix misplaced ifdef for Windows Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « gin/shell_runner_unittest.cc ('k') | gin/test/v8_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gin/test/file_runner.h" 5 #include "gin/test/file_runner.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "gin/array_buffer.h" 10 #include "gin/array_buffer.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void RunTestFromFile(const base::FilePath& path, FileRunnerDelegate* delegate, 54 void RunTestFromFile(const base::FilePath& path, FileRunnerDelegate* delegate,
55 bool run_until_idle) { 55 bool run_until_idle) {
56 ASSERT_TRUE(base::PathExists(path)) << path.LossyDisplayName(); 56 ASSERT_TRUE(base::PathExists(path)) << path.LossyDisplayName();
57 std::string source; 57 std::string source;
58 ASSERT_TRUE(ReadFileToString(path, &source)); 58 ASSERT_TRUE(ReadFileToString(path, &source));
59 59
60 base::MessageLoop message_loop; 60 base::MessageLoop message_loop;
61 61
62 #ifdef V8_USE_EXTERNAL_STARTUP_DATA 62 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
63 gin::V8Initializer::LoadV8Snapshot(); 63 gin::V8Initializer::LoadV8Snapshot();
64 gin::V8Initializer::LoadV8Natives();
64 #endif 65 #endif
65 66
66 gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode, 67 gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode,
67 gin::ArrayBufferAllocator::SharedInstance()); 68 gin::ArrayBufferAllocator::SharedInstance());
68 69
69 gin::IsolateHolder instance; 70 gin::IsolateHolder instance;
70 gin::ShellRunner runner(delegate, instance.isolate()); 71 gin::ShellRunner runner(delegate, instance.isolate());
71 { 72 {
72 gin::Runner::Scope scope(&runner); 73 gin::Runner::Scope scope(&runner);
73 v8::V8::SetCaptureStackTraceForUncaughtExceptions(true); 74 v8::V8::SetCaptureStackTraceForUncaughtExceptions(true);
74 runner.Run(source, path.AsUTF8Unsafe()); 75 runner.Run(source, path.AsUTF8Unsafe());
75 76
76 if (run_until_idle) { 77 if (run_until_idle) {
77 message_loop.RunUntilIdle(); 78 message_loop.RunUntilIdle();
78 } else { 79 } else {
79 message_loop.Run(); 80 message_loop.Run();
80 } 81 }
81 82
82 v8::Local<v8::Value> result = runner.global()->Get( 83 v8::Local<v8::Value> result = runner.global()->Get(
83 StringToSymbol(runner.GetContextHolder()->isolate(), "result")); 84 StringToSymbol(runner.GetContextHolder()->isolate(), "result"));
84 EXPECT_EQ("PASS", V8ToString(result)); 85 EXPECT_EQ("PASS", V8ToString(result));
85 } 86 }
86 } 87 }
87 88
88 } // namespace gin 89 } // namespace gin
OLDNEW
« no previous file with comments | « gin/shell_runner_unittest.cc ('k') | gin/test/v8_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698