diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-03 18:16:48 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-03 18:16:48 +0000 |
| commit | e3bb3bce3e9c1f3bc8ee779b1b3383c18e560bce (patch) | |
| tree | 7bac26223ad53f918449d00f48fa4e29508a2a7d /gm | |
| parent | b06e88dc6505412cc2b1a5f0bfb0f669465e1f8e (diff) | |
Add JSON output option to bench.
A new command-line flag --outResultsFile takes the filename to write the JSON into.
The human readable output is the same as before with one exception. Previously DEBUG would be printed if in debug mode, or nothing would be printed if in release mode. Now this is reported as a named option:
build=DEBUG
or
build=RELEASE
R=djsollen@google.com, bsalomon@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/83863002
git-svn-id: http://skia.googlecode.com/svn/trunk@12465 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/gm_expectations.h | 12 | ||||
| -rw-r--r-- | gm/gmmain.cpp | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/gm/gm_expectations.h b/gm/gm_expectations.h index 5ff009e167..c6a2693b17 100644 --- a/gm/gm_expectations.h +++ b/gm/gm_expectations.h @@ -11,22 +11,12 @@ #include "SkBitmap.h" #include "SkBitmapHasher.h" #include "SkData.h" +#include "SkJSONCPP.h" #include "SkOSFile.h" #include "SkRefCnt.h" #include "SkStream.h" #include "SkTArray.h" -#ifdef SK_BUILD_FOR_WIN - // json includes xlocale which generates warning 4530 because we're compiling without - // exceptions; see https://code.google.com/p/skia/issues/detail?id=1067 - #pragma warning(push) - #pragma warning(disable : 4530) -#endif -#include "json/reader.h" -#include "json/value.h" -#ifdef SK_BUILD_FOR_WIN - #pragma warning(pop) -#endif namespace skiagm { diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 86a346da66..c4283a8422 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -30,6 +30,7 @@ #include "SkGraphics.h" #include "SkImageDecoder.h" #include "SkImageEncoder.h" +#include "SkJSONCPP.h" #include "SkOSFile.h" #include "SkPDFRasterizer.h" #include "SkPicture.h" @@ -50,17 +51,6 @@ static const bool kDebugOnly = false; __SK_FORCE_IMAGE_DECODER_LINKING; -#ifdef SK_BUILD_FOR_WIN - // json includes xlocale which generates warning 4530 because we're compiling without - // exceptions; see https://code.google.com/p/skia/issues/detail?id=1067 - #pragma warning(push) - #pragma warning(disable : 4530) -#endif -#include "json/value.h" -#ifdef SK_BUILD_FOR_WIN - #pragma warning(pop) -#endif - #if SK_SUPPORT_GPU #include "GrContextFactory.h" #include "SkGpuDevice.h" |