Index: media/media_unittests.scons |
=================================================================== |
--- media/media_unittests.scons (revision 8575) |
+++ media/media_unittests.scons (working copy) |
@@ -51,12 +51,70 @@ |
'base/run_all_unittests.cc', |
] |
+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('support', [ |
+ 'base/run_all_unittests.cc', |
+ ]), |
+ MSVSFilter('tests', [ |
+ MSVSFilter('base', [ |
+ 'base/data_buffer_unittest.cc', |
+ ]), |
+ MSVSFilter('audio', [ |
+ 'audio/win/audio_output_win_unittest.cc', |
+ ]), |
+ ]), |
+]) |
+ |
+if not env.Bit('windows'): |
+ input_files.Remove( |
+ 'audio/win/audio_output_win_unittest.cc', |
+ ) |
+ |
env.ChromeTestProgram('media_unittests', input_files) |
-env.ChromeMSVSProject('$MEDIA_DIR/build/media_unittests.vcproj', |
- dependencies = [ |
- '$BASE_DIR/build/base.vcproj', |
- '$MEDIA_DIR/build/media.vcproj', |
- '$TESTING_DIR/gtest.vcproj', |
- ], |
- guid='{C8C6183C-B03C-11DD-B471-DFD256D89593}') |
+p = env.ChromeMSVSProject('build/media_unittests.vcproj', |
+ dest=('$CHROME_SRC_DIR/media/' + |
+ 'build/media_unittests.vcproj'), |
+ guid='{C8C6183C-B03C-11DD-B471-DFD256D89593}', |
+ keyword='Win32Proj', |
+ # TODO(sgk): when we can intuit the hierarchy |
+ # from the built targets. |
+ #buildtargets=TODO, |
+ files=input_files, |
+ tools=[ |
+ 'VCPreBuildEventTool', |
+ 'VCCustomBuildTool', |
+ 'VCXMLDataGeneratorTool', |
+ 'VCWebServiceProxyGeneratorTool', |
+ 'VCMIDLTool', |
+ MSVSTool('VCCLCompilerTool', |
+ PreprocessorDefinitions='UNIT_TEST'), |
+ 'VCManagedResourceCompilerTool', |
+ 'VCResourceCompilerTool', |
+ 'VCPreLinkEventTool', |
+ 'VCLinkerTool', |
+ 'VCALinkTool', |
+ 'VCManifestTool', |
+ 'VCXDCMakeTool', |
+ 'VCBscMakeTool', |
+ 'VCFxCopTool', |
+ 'VCAppVerifierTool', |
+ 'VCWebDeploymentTool', |
+ 'VCPostBuildEventTool', |
+ ], |
+ ConfigurationType='1') |
+ |
+p.AddConfig('Debug|Win32', |
+ InheritedPropertySheets=[ |
+ '$(SolutionDir)../build/debug.vsprops', |
+ '$(SolutionDir)../testing/using_gtest.vsprops', |
+ ]) |
+ |
+p.AddConfig('Release|Win32', |
+ InheritedPropertySheets=[ |
+ '$(SolutionDir)../build/release.vsprops', |
+ '$(SolutionDir)../testing/using_gtest.vsprops', |
+ ]) |