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

Side by Side Diff: chrome/test/startup/startup_tests.scons

Issue 27240: Make startup_tests build and run on Linux (except reference tests). (Closed)
Patch Set: small bugfix in process_util Created 11 years, 9 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 | « chrome/test/startup/startup_test.cc ('k') | chrome/test/ui/ui_test.h » ('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 (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') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 env.ApplySConscript([ 9 env.ApplySConscript([
10 '$BASE_DIR/using_base.scons', 10 '$BASE_DIR/using_base.scons',
11 '$BASE_DIR/gfx/using_base_gfx.scons', 11 '$BASE_DIR/gfx/using_base_gfx.scons',
12 '$CHROME_SRC_DIR/build/using_googleurl.scons', 12 '$CHROME_SRC_DIR/build/using_googleurl.scons',
13 '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons',
13 '$GTEST_DIR/../using_gtest.scons', 14 '$GTEST_DIR/../using_gtest.scons',
14 '$ICU38_DIR/using_icu38.scons', 15 '$ICU38_DIR/using_icu38.scons',
15 '$LIBPNG_DIR/using_libpng.scons', 16 '$LIBPNG_DIR/using_libpng.scons',
16 '$MODP_B64_DIR/using_modp_b64.scons', 17 '$MODP_B64_DIR/using_modp_b64.scons',
17 '$NET_DIR/using_net.scons', 18 '$NET_DIR/using_net.scons',
18 '$SKIA_DIR/using_skia.scons', 19 '$SKIA_DIR/using_skia.scons',
19 '$ZLIB_DIR/using_zlib.scons', 20 '$ZLIB_DIR/using_zlib.scons',
20 ]) 21 ])
21 22
22 env.Prepend( 23 env.Prepend(
23 CPPDEFINES = [ 24 CPPDEFINES = [
24 'UI_TEST', 25 'UI_TEST',
25 ], 26 ],
26 CPPPATH = [ 27 CPPPATH = [
27 '$CHROME_SRC_DIR', 28 '$CHROME_SRC_DIR',
28 ], 29 ],
29 LIBS = [ 30 LIBS = [
30 'automation', 31 'automation',
31 'browser', 32 'browser',
32 'browser_views',
33 'common', 33 'common',
34 'glue',
35 'WTF',
34 ], 36 ],
35 ) 37 )
36 38
37 if env.Bit('windows'): 39 if env.Bit('windows'):
38 env.Prepend( 40 env.Prepend(
39 LINKFLAGS = [ 41 LINKFLAGS = [
40 '/INCREMENTAL', 42 '/INCREMENTAL',
41 '/DEBUG', 43 '/DEBUG',
42 44
43 '/DELAYLOAD:"dwmapi.dll"', 45 '/DELAYLOAD:"dwmapi.dll"',
44 '/DELAYLOAD:"uxtheme.dll"', 46 '/DELAYLOAD:"uxtheme.dll"',
45 47
46 '/MACHINE:X86', 48 '/MACHINE:X86',
47 '/FIXED:No', 49 '/FIXED:No',
48 50
49 '/safeseh', 51 '/safeseh',
50 '/dynamicbase', 52 '/dynamicbase',
51 '/ignore:4199', 53 '/ignore:4199',
52 '/nxcompat', 54 '/nxcompat',
53 ], 55 ],
54 LIBS = [ 56 LIBS = [
57 'browser_views',
55 'comsupp', 58 'comsupp',
56 'oleacc', 59 'oleacc',
57 'rpcrt4', 60 'rpcrt4',
58 'winmm', 61 'winmm',
59 ], 62 ],
60 ) 63 )
61 64
62 input_files = ChromeFileList([ 65 input_files = ChromeFileList([
63 # TODO(sgk): violate standard indentation so we don't have to 66 # TODO(sgk): violate standard indentation so we don't have to
64 # reindent too much when we remove the explicit MSVSFilter() calls 67 # reindent too much when we remove the explicit MSVSFilter() calls
65 # in favor of generating the hierarchy to reflect the file system. 68 # in favor of generating the hierarchy to reflect the file system.
66 MSVSFilter('Common', [ 69 MSVSFilter('Common', [
67 '$CHROME_DIR/tools/build/win/precompiled.cc', 70 '$CHROME_DIR/tools/build/win/precompiled.cc',
68 '$CHROME_DIR/tools/build/win/precompiled.h', 71 '$CHROME_DIR/tools/build/win/precompiled.h',
69 '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', 72 '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
70 '$CHROME_DIR/test/testing_browser_process.h', 73 '$CHROME_DIR/test/testing_browser_process.h',
71 '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', 74 '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
72 '$CHROME_DIR/test/ui/ui_test.h', 75 '$CHROME_DIR/test/ui/ui_test.h',
73 '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', 76 '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
74 ]), 77 ]),
75 MSVSFilter('TestStartup', [ 78 MSVSFilter('TestStartup', [
76 'feature_startup_test.cc', 79 'feature_startup_test.cc',
77 'startup_test.cc', 80 'startup_test.cc',
78 ]), 81 ]),
79 ]) 82 ])
80 83
81 # TODO(port): 84 if not env.Bit('windows'):
82 if env.Bit('windows'): 85 # TODO(port): port.
83 env.ChromeTestProgram('startup_tests', input_files) 86 input_files.Remove(
87 'feature_startup_test.cc',
88 )
89
90 # Windows-specific files
91 input_files.Remove(
92 '$CHROME_DIR/tools/build/win/precompiled.cc',
93 )
94
95 # Please note that currently you have to manually ensure that Hammer/chrome
96 # is up to date when you build startup_tests.
97 # TODO(sgk): Proper dependency tracking for startup_tests.
98 startup_tests = env.ChromeTestProgram('startup_tests', input_files)
84 99
85 p = env.ChromeMSVSProject('startup_tests.vcproj', 100 p = env.ChromeMSVSProject('startup_tests.vcproj',
86 dest=('$CHROME_SRC_DIR/chrome/' 101 dest=('$CHROME_SRC_DIR/chrome/'
87 + 'test/startup/startup_tests.vcproj'), 102 + 'test/startup/startup_tests.vcproj'),
88 guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}', 103 guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}',
89 dependencies = [ 104 dependencies = [
90 '$CHROME_DIR/test/automation/automation.vcproj', 105 '$CHROME_DIR/test/automation/automation.vcproj',
91 '$BASE_DIR/build/base.vcproj', 106 '$BASE_DIR/build/base.vcproj',
92 '$NET_DIR/build/net.vcproj', 107 '$NET_DIR/build/net.vcproj',
93 '$CHROME_DIR/browser/browser.vcproj', 108 '$CHROME_DIR/browser/browser.vcproj',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 '$(SolutionDir)../skia/using_skia.vsprops', 167 '$(SolutionDir)../skia/using_skia.vsprops',
153 '$(SolutionDir)../testing/using_gtest.vsprops', 168 '$(SolutionDir)../testing/using_gtest.vsprops',
154 ]) 169 ])
155 170
156 p.AddFileConfig('../../tools/build/win/precompiled.cc', 171 p.AddFileConfig('../../tools/build/win/precompiled.cc',
157 'Debug|Win32', 172 'Debug|Win32',
158 tools=[ 173 tools=[
159 MSVSTool('VCCLCompilerTool', 174 MSVSTool('VCCLCompilerTool',
160 UsePrecompiledHeader='1'), 175 UsePrecompiledHeader='1'),
161 ]) 176 ])
OLDNEW
« no previous file with comments | « chrome/test/startup/startup_test.cc ('k') | chrome/test/ui/ui_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698