summaryrefslogtreecommitdiffstats
path: root/chrome/test/page_cycler/page_cycler_tests.scons
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 06:13:21 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 06:13:21 +0000
commitf938d60dc26ef9c23f2757d327052386ccd88689 (patch)
treebefcad667bd0e09dab7ae6c4541f8895a5d096f1 /chrome/test/page_cycler/page_cycler_tests.scons
parent4d82249eef448fd0b6c8c465f3846a77e870ddfc (diff)
downloadchromium_src-f938d60dc26ef9c23f2757d327052386ccd88689.zip
chromium_src-f938d60dc26ef9c23f2757d327052386ccd88689.tar.gz
chromium_src-f938d60dc26ef9c23f2757d327052386ccd88689.tar.bz2
Make page_cycler_tests build on Linux (doesn't run successfully yet).
Review URL: http://codereview.chromium.org/40182 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/page_cycler/page_cycler_tests.scons')
-rw-r--r--chrome/test/page_cycler/page_cycler_tests.scons12
1 files changed, 9 insertions, 3 deletions
diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons
index b265b25..984baf1 100644
--- a/chrome/test/page_cycler/page_cycler_tests.scons
+++ b/chrome/test/page_cycler/page_cycler_tests.scons
@@ -10,6 +10,7 @@ env.ApplySConscript([
'$BASE_DIR/using_base.scons',
'$BASE_DIR/gfx/using_base_gfx.scons',
'$CHROME_SRC_DIR/build/using_googleurl.scons',
+ '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons',
'$GTEST_DIR/../using_gtest.scons',
'$ICU38_DIR/using_icu38.scons',
'$LIBPNG_DIR/using_libpng.scons',
@@ -31,6 +32,8 @@ env.Prepend(
'browser',
'browser_views',
'common',
+ 'glue',
+ 'WTF',
],
)
@@ -89,9 +92,12 @@ if not env.Bit('windows'):
'$CHROME_DIR/tools/build/win/precompiled_wtl.h',
)
-# TODO(port):
-if env.Bit('windows'):
- env.ChromeTestProgram('page_cycler_tests', input_files)
+ # TODO(port): Remove files from this list as they get ported.
+ input_files.Remove(
+ '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+ )
+
+env.ChromeTestProgram('page_cycler_tests', input_files)
p = env.ChromeMSVSProject('page_cycler_tests.vcproj',
dest=('$CHROME_SRC_DIR/chrome/'