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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/startup/startup_tests.scons

Issue 53121: Remove the checked-in scons configuration files. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/selenium/selenium_tests.scons ('k') | chrome/test/tab_switching/tab_switching_test.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/startup/startup_tests.scons
===================================================================
--- chrome/test/startup/startup_tests.scons (revision 12583)
+++ chrome/test/startup/startup_tests.scons (working copy)
@@ -1,179 +0,0 @@
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-Import('env')
-
-env = env.Clone()
-
-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',
- '$MODP_B64_DIR/using_modp_b64.scons',
- '$NET_DIR/using_net.scons',
- '$SKIA_DIR/using_skia.scons',
- '$ZLIB_DIR/using_zlib.scons',
-])
-
-env.Prepend(
- CPPDEFINES = [
- 'UI_TEST',
- ],
- CPPPATH = [
- '$CHROME_SRC_DIR',
- ],
- LIBS = [
- 'automation',
- 'browser',
- 'common',
- 'glue',
- 'WTF',
- # needed for shared link deps
- 'sqlite',
- 'xslt',
- ],
-)
-
-if env.Bit('windows'):
- env.Prepend(
- LINKFLAGS = [
- '/INCREMENTAL',
- '/DEBUG',
-
- '/DELAYLOAD:"dwmapi.dll"',
- '/DELAYLOAD:"uxtheme.dll"',
-
- '/MACHINE:X86',
- '/FIXED:No',
-
- '/safeseh',
- '/dynamicbase',
- '/ignore:4199',
- '/nxcompat',
- ],
- LIBS = [
- 'browser_views',
- 'comsupp',
- 'oleacc',
- 'rpcrt4',
- 'winmm',
- ],
- )
-
-input_files = ChromeFileList([
- # TODO(sgk): violate standard indentation so we don't have to
- # reindent too much when we remove the explicit MSVSFilter() calls
- # in favor of generating the hierarchy to reflect the file system.
- MSVSFilter('Common', [
- '$CHROME_DIR/tools/build/win/precompiled.cc',
- '$CHROME_DIR/tools/build/win/precompiled.h',
- '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
- '$CHROME_DIR/test/testing_browser_process.h',
- '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
- '$CHROME_DIR/test/ui/ui_test.h',
- '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
- ]),
- MSVSFilter('TestStartup', [
- 'feature_startup_test.cc',
- 'startup_test.cc',
- ]),
-])
-
-if not env.Bit('windows'):
- # TODO(port): port.
- input_files.Remove(
- 'feature_startup_test.cc',
- )
-
- # Windows-specific files
- input_files.Remove(
- '$CHROME_DIR/tools/build/win/precompiled.cc',
- )
-
-# Please note that currently you have to manually ensure that Hammer/chrome
-# is up to date when you build startup_tests.
-# TODO(sgk): Proper dependency tracking for startup_tests.
-startup_tests = env.ChromeTestProgram('startup_tests', input_files)
-
-p = env.ChromeMSVSProject('startup_tests.vcproj',
- dest=('$CHROME_SRC_DIR/chrome/'
- + 'test/startup/startup_tests.vcproj'),
- guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}',
- dependencies = [
- '$CHROME_DIR/test/automation/automation.vcproj',
- '$BASE_DIR/build/base.vcproj',
- '$NET_DIR/build/net.vcproj',
- '$CHROME_DIR/browser/browser.vcproj',
- '$MODP_B64_DIR/modp_b64.vcproj',
- '$CHROME_DIR/app/chrome_exe.vcproj',
- '$ZLIB_DIR/zlib.vcproj',
- '$CHROME_DIR/common/common.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$BASE_DIR/build/base_gfx.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- '$LIBPNG_DIR/libpng.vcproj',
- '$SKIA_DIR/skia.vcproj',
- '$GOOGLEURL_DIR/build/googleurl.vcproj',
- '$CHROME_DIR/browser/views/browser_views.vcproj',
- ],
- # TODO(sgk): when we can intuit the hierarchy
- # from the built targets.
- #buildtargets=TODO,
- files=input_files,
- local_directory_prefix='./',
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- 'VCCLCompilerTool',
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- MSVSTool('VCLinkerTool',
- AdditionalDependencies='winmm.lib'),
- 'VCALinkTool',
- 'VCManifestTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCAppVerifierTool',
- 'VCWebDeploymentTool',
- 'VCPostBuildEventTool',
- ],
- ConfigurationType='1')
-
-
-p.AddConfig('Debug|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/debug.vsprops',
- '../../tools/build/win/precompiled.vsprops',
- '../../tools/build/win/unit_test.vsprops',
- '../../tools/build/win/ui_test.vsprops',
- '$(SolutionDir)../skia/using_skia.vsprops',
- '$(SolutionDir)../testing/using_gtest.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/release.vsprops',
- '../../tools/build/win/unit_test.vsprops',
- '../../tools/build/win/ui_test.vsprops',
- '$(SolutionDir)../skia/using_skia.vsprops',
- '$(SolutionDir)../testing/using_gtest.vsprops',
- ])
-
-p.AddFileConfig('../../tools/build/win/precompiled.cc',
- 'Debug|Win32',
- tools=[
- MSVSTool('VCCLCompilerTool',
- UsePrecompiledHeader='1'),
- ])
« no previous file with comments | « chrome/test/selenium/selenium_tests.scons ('k') | chrome/test/tab_switching/tab_switching_test.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698