diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 22:42:47 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 22:42:47 +0000 |
| commit | 9fa8346c82785a5adbb8ddea867b35e7f6057bea (patch) | |
| tree | e65b3188240a995313dad89fe5ae15e5d3ba439c | |
| parent | ee068d753d1b4673d8cd5fefdb09ead14a9e29cd (diff) | |
| download | chromium_src-9fa8346c82785a5adbb8ddea867b35e7f6057bea.zip chromium_src-9fa8346c82785a5adbb8ddea867b35e7f6057bea.tar.gz chromium_src-9fa8346c82785a5adbb8ddea867b35e7f6057bea.tar.bz2 | |
Fix double free in test_shell_tests on linux with SHARED=1.
Original patch by Craig Schlenter at:
http://codereview.chromium.org/17233
Review URL: http://codereview.chromium.org/21103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9265 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 06d28c7..8e8b580 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -7,12 +7,6 @@ Import('env', 'env_res') env = env.Clone() env_res = env_res.Clone() -env.SConscript([ - '$BZIP2_DIR/using_bzip2.scons', - '$LIBXML_DIR/using_libxml.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', -], {'env':env}) - if env.Bit('windows'): env_res.Append( CPPPATH = [ @@ -103,6 +97,19 @@ if env.Bit('mac'): ], ) +env_lib = env.Clone() + +env.SConscript([ + '$BZIP2_DIR/using_bzip2.scons', + '$LIBXML_DIR/using_libxml.scons', + '$CHROME_SRC_DIR/build/using_v8.scons', +], {'env':env}) + +env_lib.SConscript([ + '$BZIP2_DIR/using_bzip2.scons', + '$LIBXML_DIR/using_libxml.scons', +], {'env':env_lib}) + input_files = [ 'event_sending_controller.cc', 'layout_test_controller.cc', @@ -139,7 +146,7 @@ elif env.Bit('linux'): 'test_webview_delegate_gtk.cc', ]) -lib = env.ChromeLibrary('test_shell', input_files) +lib = env_lib.ChromeLibrary('test_shell', input_files) env.Append(LIBS = ['test_shell']) |