diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 01:31:22 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 01:31:22 +0000 |
| commit | 648a8e0e81a6794202d4afa61f0a5c77dbc1d6dd (patch) | |
| tree | c6716b3facb7c9717dc7f52ec969b39eead0b8af /media/test | |
| parent | 3573b43d8178c8c9b4c4efc937e3ca3342bdae11 (diff) | |
| download | chromium_src-648a8e0e81a6794202d4afa61f0a5c77dbc1d6dd.zip chromium_src-648a8e0e81a6794202d4afa61f0a5c77dbc1d6dd.tar.gz chromium_src-648a8e0e81a6794202d4afa61f0a5c77dbc1d6dd.tar.bz2 | |
media_Bench and ffmpeg_tests disable exception handler by default
BUG=47307
TEST=no change in normal behavior.
Review URL: http://codereview.chromium.org/2811026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/test')
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 73dd46d..0b95b00 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -30,8 +30,14 @@ #endif #if defined(OS_WIN) + +// Enable to build with exception handler +//#define ENABLE_WINDOWS_EXCEPTIONS 1 + +#ifdef ENABLE_WINDOWS_EXCEPTIONS // warning: disable warning about exception handler. #pragma warning(disable:4509) +#endif // Thread priorities to make benchmark more stable. @@ -101,7 +107,7 @@ int main(int argc, const char** argv) { bool hash_md5 = false; std::ostream* log_out = &std::cout; -#if defined(OS_WIN) +#if defined(ENABLE_WINDOWS_EXCEPTIONS) // Catch exceptions so this tool can be used in automated testing. __try { #endif @@ -475,7 +481,7 @@ int main(int argc, const char** argv) { << " " << in_path << std::endl; } #endif // SHOW_VERBOSE -#if defined(OS_WIN) +#if defined(ENABLE_WINDOWS_EXCEPTIONS) } __except(EXCEPTION_EXECUTE_HANDLER) { *log_out << " Exception:" << std::setw(11) << GetExceptionCode() << " " << in_path << std::endl; |