| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 '/nxcompat', | 90 '/nxcompat', |
| 91 ], | 91 ], |
| 92 ) | 92 ) |
| 93 elif env['PLATFORM'] in ('posix', 'darwin'): | 93 elif env['PLATFORM'] in ('posix', 'darwin'): |
| 94 env.Append( | 94 env.Append( |
| 95 LIBS = [ | 95 LIBS = [ |
| 96 'event', | 96 'event', |
| 97 ] | 97 ] |
| 98 ) | 98 ) |
| 99 | 99 |
| 100 if env['PLATFORM'] == 'darwin': |
| 101 env.Append( |
| 102 CPPPATH = [ |
| 103 '$THIRD_PARTY_DIR/WebKit/WebKit/mac/WebCoreSupport', |
| 104 ], |
| 105 ) |
| 106 |
| 100 input_files = [ | 107 input_files = [ |
| 101 'event_sending_controller.cc', | 108 'event_sending_controller.cc', |
| 102 'layout_test_controller.cc', | 109 'layout_test_controller.cc', |
| 103 'simple_resource_loader_bridge.cc', | 110 'simple_resource_loader_bridge.cc', |
| 104 'test_navigation_controller.cc', | 111 'test_navigation_controller.cc', |
| 105 'test_shell_request_context.cc', | 112 'test_shell_request_context.cc', |
| 106 'test_shell_switches.cc', | 113 'test_shell_switches.cc', |
| 107 'test_shell.cc', | 114 'test_shell.cc', |
| 108 'test_webview_delegate.cc', | 115 'test_webview_delegate.cc', |
| 109 'text_input_controller.cc', | 116 'text_input_controller.cc', |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 # Commented out until a regression is fixed and this file is restored. | 196 # Commented out until a regression is fixed and this file is restored. |
| 190 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', | 197 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', |
| 191 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', | 198 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', |
| 192 '$WEBKIT_DIR/port/platform/graphics/chromium/UniscribeHelper_unittest.cpp'
, | 199 '$WEBKIT_DIR/port/platform/graphics/chromium/UniscribeHelper_unittest.cpp'
, |
| 193 ]) | 200 ]) |
| 194 | 201 |
| 195 test_shell_tests = env.ChromeTestProgram('test_shell_tests', | 202 test_shell_tests = env.ChromeTestProgram('test_shell_tests', |
| 196 resources + test_files) | 203 resources + test_files) |
| 197 i = env.Install('$TARGET_ROOT', test_shell_tests) | 204 i = env.Install('$TARGET_ROOT', test_shell_tests) |
| 198 env.Alias('webkit', i) | 205 env.Alias('webkit', i) |
| OLD | NEW |