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 /include | |
| 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 'include')
| -rw-r--r-- | include/utils/SkJSONCPP.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/include/utils/SkJSONCPP.h b/include/utils/SkJSONCPP.h new file mode 100644 index 0000000000..8dbb40c91b --- /dev/null +++ b/include/utils/SkJSONCPP.h @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + * + * A common place to put the jsoncpp library includes, as opposed to littering + * the pragmas repeatedly through our code. + */ +#ifndef SkJSONCPP_DEFINED +#define SkJSONCPP_DEFINED + +#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 + +#endif |