summaryrefslogtreecommitdiffstats
path: root/chrome/SConscript
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 18:16:01 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 18:16:01 +0000
commit954bc8a57743da5092b218285b4b8f14239235dd (patch)
tree32976cb1f0b7a534b8d4f44fec2e91dd146c1d74 /chrome/SConscript
parent22514d70ddb3ce5a3eb99cd022f909d5d7298793 (diff)
downloadchromium_src-954bc8a57743da5092b218285b4b8f14239235dd.zip
chromium_src-954bc8a57743da5092b218285b4b8f14239235dd.tar.gz
chromium_src-954bc8a57743da5092b218285b4b8f14239235dd.tar.bz2
Include chrome SConscript.unit_tests in Linux build.
BUG=2335 Original patch by phajdan.jr@gmail.com in http://codereview.chromium.org/2891 R=mark,sgk Review URL: http://codereview.chromium.org/2939 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript')
-rw-r--r--chrome/SConscript8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/SConscript b/chrome/SConscript
index 185b186..282e6c2 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -414,15 +414,17 @@ if env_flat['PLATFORM'] == 'win32':
CPPPATH=['..'] + env['CPPPATH'])
test_sconscript_files = [
- 'SConscript.automated_ui_tests',
'SConscript.unit_tests',
- 'SConscript.ui_tests',
]
# TODO(port)
if env['PLATFORM'] == 'win32':
- env.SConscript(test_sconscript_files, exports=['env_test'])
+ test_sconscript_files.extend([
+ 'SConscript.automated_ui_tests',
+ 'SConscript.ui_tests',
+ ])
+env.SConscript(test_sconscript_files, exports=['env_test'])
sconscript_files = [
'browser/SConscript',