| OLD | NEW | 
|---|
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 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 Import('env', 'env_res') | 5 Import('env', 'env_res') | 
| 6 | 6 | 
| 7 env = env.Clone() | 7 env = env.Clone() | 
| 8 env_res = env_res.Clone() | 8 env_res = env_res.Clone() | 
| 9 | 9 | 
| 10 env.SConscript([ | 10 env.SConscript([ | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 23       ], | 23       ], | 
| 24   ) | 24   ) | 
| 25 | 25 | 
| 26 env.Append( | 26 env.Append( | 
| 27     CPPPATH = [ | 27     CPPPATH = [ | 
| 28         '$BREAKPAD_DIR/src', | 28         '$BREAKPAD_DIR/src', | 
| 29         '$WEBKIT_DIR/glue', | 29         '$WEBKIT_DIR/glue', | 
| 30         '$GTEST_DIR/include', | 30         '$GTEST_DIR/include', | 
| 31     ], | 31     ], | 
| 32     LIBS = [ | 32     LIBS = [ | 
| 33         'dmg_fp', |  | 
| 34         'test_shell', | 33         'test_shell', | 
| 35         'glue', | 34         'glue', | 
| 36         'port', | 35         'port', | 
| 37         'base', | 36         'base', | 
| 38         'base_gfx', | 37         'base_gfx', | 
| 39         'breakpad_handler', | 38         'breakpad_handler', | 
| 40         'googleurl', | 39         'googleurl', | 
| 41         'net', | 40         'net', | 
| 42         'sdch', | 41         'sdch', | 
| 43         'skia', | 42         'skia', | 
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 189       'plugin_tests.cc', | 188       'plugin_tests.cc', | 
| 190       # Commented out until a regression is fixed and this file is restored. | 189       # Commented out until a regression is fixed and this file is restored. | 
| 191       #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', | 190       #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', | 
| 192       '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', | 191       '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', | 
| 193   ]) | 192   ]) | 
| 194 | 193 | 
| 195 test_shell_tests = env.ChromeTestProgram('test_shell_tests', | 194 test_shell_tests = env.ChromeTestProgram('test_shell_tests', | 
| 196                                          resources + test_files) | 195                                          resources + test_files) | 
| 197 i = env.Install('$TARGET_ROOT', test_shell_tests) | 196 i = env.Install('$TARGET_ROOT', test_shell_tests) | 
| 198 env.Alias('webkit', i) | 197 env.Alias('webkit', i) | 
| OLD | NEW | 
|---|