diff options
| author | sgjesse@google.com <sgjesse@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 12:19:08 +0000 |
|---|---|---|
| committer | sgjesse@google.com <sgjesse@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 12:19:08 +0000 |
| commit | a6aaa3fa91a4dd833c2064b3c1ddb2f90d321cd9 (patch) | |
| tree | 97b52d34b1d8cac99cea1578f317bec546496bf8 /webkit | |
| parent | a568a227fb8e8b369d93556b8ed7b84f58c535a9 (diff) | |
| download | chromium_src-a6aaa3fa91a4dd833c2064b3c1ddb2f90d321cd9.zip chromium_src-a6aaa3fa91a4dd833c2064b3c1ddb2f90d321cd9.tar.gz chromium_src-a6aaa3fa91a4dd833c2064b3c1ddb2f90d321cd9.tar.bz2 | |
Make sure that gc is exposed in the test_shell
The change in r63863 added the option of changing the V8 JavaScript flags while running tests. However the --expose-gc flag needs to be set before V8 is initialized to the gc object to be available.
BUG=60864
Review URL: http://codereview.chromium.org/4174004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64056 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 5d43e0b..d1f0c58 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -280,14 +280,15 @@ int main(int argc, char* argv[]) { flags = js_flags.substr(start, comma_pos - start); start = comma_pos + 1; } - // Test shell always exposes the GC. - flags += " --expose-gc"; js_flags_list.push_back(flags); if (comma_pos == std::string::npos) break; } TestShell::SetJavaScriptFlags(js_flags_list); + // Test shell always exposes the GC. + webkit_glue::SetJavaScriptFlags("--expose-gc"); + // Expose GCController to JavaScript. WebScriptController::registerExtension(extensions_v8::GCExtension::Get()); |