diff options
Diffstat (limited to 'chrome/test/selenium/selenium_tests.scons')
| -rw-r--r-- | chrome/test/selenium/selenium_tests.scons | 117 |
1 files changed, 96 insertions, 21 deletions
diff --git a/chrome/test/selenium/selenium_tests.scons b/chrome/test/selenium/selenium_tests.scons index 7e29c94..f0c066a 100644 --- a/chrome/test/selenium/selenium_tests.scons +++ b/chrome/test/selenium/selenium_tests.scons @@ -65,33 +65,108 @@ if env.Bit('windows'): ], ) -input_files = [ +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_wtl$OBJSUFFIX', + '$CHROME_DIR/tools/build/win/precompiled_wtl.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('TestSelenium', [ 'selenium_test.cc', -] + ]), +]) + +if not env.Bit('windows'): + # Windows-specific. + input_files.Remove( + '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', + '$CHROME_DIR/tools/build/win/precompiled_wtl.h', + ) # TODO(port): if env.Bit('windows'): env.ChromeTestProgram('selenium_tests', input_files) -env.ChromeMSVSProject('$CHROME_DIR/test/selenium/selenium_tests.vcproj', - 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', - ], - guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}') +p = env.ChromeMSVSProject('selenium_tests.vcproj', + dest=('$CHROME_SRC_DIR/chrome/' + + 'test/selenium/selenium_tests.vcproj'), + guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}', + 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_wtl.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_wtl.cc', + 'Debug|Win32', + tools=[ + MSVSTool('VCCLCompilerTool', + UsePrecompiledHeader='1'), + ]) |