2014-11-04 15:21:10 +00:00
|
|
|
/*
|
|
|
|
* Copyright 2014 Google Inc.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
* found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef DMJsonWriter_DEFINED
|
|
|
|
#define DMJsonWriter_DEFINED
|
|
|
|
|
|
|
|
#include "SkString.h"
|
When running DM, write test failures to json.
Add skiatest::Failure to keep track of data about a test failure.
Reporter::reportFailed and ::onReportFailed now take Failure as a
parameter. This allows the implementation to treat the failure as it
wishes. Provide a helper to format the failure the same as prior to
the change.
Update the macros for calling reportFailed (REPORTER_ASSERT etc) to
create a Failure object.
Convert a direct call to reportFailed to the macro ERRORF.
Write Failures to Json.
Sample output when running dm on the dummy test crrev.com/705723004:
{
"test_results" : {
"failures" : [
{
"condition" : "0 > 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 10,
"message" : ""
},
{
"condition" : "false",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 4,
"message" : ""
},
{
"condition" : "1 == 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 5,
"message" : "I can too count!"
},
{
"condition" : "",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 6,
"message" : "seven is 7"
},
{
"condition" : "1 == 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 14,
"message" : "I can too count!"
}
]
}
}
Report all of the failures from one test.
Previously, if one test had multiple failures, only one was reportered.
e.g:
Failures:
test Dummy: ../../tests/DummyTest.cpp:6 seven is 7
test Dummy2: ../../tests/DummyTest.cpp:10 0 > 3
test Dummy3: ../../tests/DummyTest.cpp:14 I can too count!: 1 == 3
3 failures.
Now, we get all the messages:
Failures:
test Dummy: ../../tests/DummyTest.cpp:4 false
../../tests/DummyTest.cpp:5 I can too count!: 1 == 3
../../tests/DummyTest.cpp:6 seven is 7
test Dummy2: ../../tests/DummyTest.cpp:10 0 > 3
test Dummy3: ../../tests/DummyTest.cpp:14 I can too count!: 1 == 3
3 failures.
(Note that we still state "3 failures" because 3 DM::Tasks failed.)
BUG=skia:3082
BUG=skia:2454
Review URL: https://codereview.chromium.org/694703005
2014-11-07 14:07:32 +00:00
|
|
|
#include "Test.h"
|
2014-11-04 15:21:10 +00:00
|
|
|
|
|
|
|
namespace DM {
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Class for collecting results from DM and writing to a json file.
|
|
|
|
* All methods are thread-safe.
|
|
|
|
*/
|
|
|
|
class JsonWriter {
|
|
|
|
public:
|
|
|
|
/**
|
|
|
|
* Info describing a single run.
|
|
|
|
*/
|
|
|
|
struct BitmapResult {
|
2015-01-15 18:56:12 +00:00
|
|
|
SkString name; // E.g. "ninepatch-stretch", "desk_gws.skp"
|
|
|
|
SkString config; // "gpu", "8888", "serialize", "pipe"
|
|
|
|
SkString sourceType; // "gm", "skp", "image"
|
2015-04-03 14:24:48 +00:00
|
|
|
SkString sourceOptions; // "image", "codec", "subset", "scanline"
|
2014-11-04 15:21:10 +00:00
|
|
|
SkString md5; // In ASCII, so 32 bytes long.
|
2015-01-15 18:56:12 +00:00
|
|
|
SkString ext; // Extension of file we wrote: "png", "pdf", ...
|
Add gamma_correct option field to dm.json
E.g.
{
"max_rss_MB" : 23,
"results" : [
{
"key" : {
"config" : "pdf",
"name" : "gamma",
"source_type" : "gm"
},
"md5" : "c5dfb531f4d76c77c3305b6a04733262",
"options" : {
"ext" : "pdf",
"gamma_correct" : false
}
},
{
"key" : {
"config" : "8888",
"name" : "gamma",
"source_type" : "gm"
},
"md5" : "6177860ed24106446d3a9087527e67bf",
"options" : {
"ext" : "png",
"gamma_correct" : false
}
},
{
"key" : {
"config" : "f16",
"name" : "gamma",
"source_type" : "gm"
},
"md5" : "213f80145953ecd4c71e0612447b2ad9",
"options" : {
"ext" : "png",
"gamma_correct" : true
}
}
]
}
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1741973002
Review URL: https://codereview.chromium.org/1741973002
2016-02-29 15:38:01 +00:00
|
|
|
bool gammaCorrect; // Old configs are not gamma correct, some new ones are.
|
2014-11-04 15:21:10 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Add a result to the end of the list of results.
|
|
|
|
*/
|
|
|
|
static void AddBitmapResult(const BitmapResult&);
|
|
|
|
|
When running DM, write test failures to json.
Add skiatest::Failure to keep track of data about a test failure.
Reporter::reportFailed and ::onReportFailed now take Failure as a
parameter. This allows the implementation to treat the failure as it
wishes. Provide a helper to format the failure the same as prior to
the change.
Update the macros for calling reportFailed (REPORTER_ASSERT etc) to
create a Failure object.
Convert a direct call to reportFailed to the macro ERRORF.
Write Failures to Json.
Sample output when running dm on the dummy test crrev.com/705723004:
{
"test_results" : {
"failures" : [
{
"condition" : "0 > 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 10,
"message" : ""
},
{
"condition" : "false",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 4,
"message" : ""
},
{
"condition" : "1 == 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 5,
"message" : "I can too count!"
},
{
"condition" : "",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 6,
"message" : "seven is 7"
},
{
"condition" : "1 == 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 14,
"message" : "I can too count!"
}
]
}
}
Report all of the failures from one test.
Previously, if one test had multiple failures, only one was reportered.
e.g:
Failures:
test Dummy: ../../tests/DummyTest.cpp:6 seven is 7
test Dummy2: ../../tests/DummyTest.cpp:10 0 > 3
test Dummy3: ../../tests/DummyTest.cpp:14 I can too count!: 1 == 3
3 failures.
Now, we get all the messages:
Failures:
test Dummy: ../../tests/DummyTest.cpp:4 false
../../tests/DummyTest.cpp:5 I can too count!: 1 == 3
../../tests/DummyTest.cpp:6 seven is 7
test Dummy2: ../../tests/DummyTest.cpp:10 0 > 3
test Dummy3: ../../tests/DummyTest.cpp:14 I can too count!: 1 == 3
3 failures.
(Note that we still state "3 failures" because 3 DM::Tasks failed.)
BUG=skia:3082
BUG=skia:2454
Review URL: https://codereview.chromium.org/694703005
2014-11-07 14:07:32 +00:00
|
|
|
/**
|
|
|
|
* Add a Failure from a Test.
|
|
|
|
*/
|
|
|
|
static void AddTestFailure(const skiatest::Failure&);
|
|
|
|
|
2014-11-04 15:21:10 +00:00
|
|
|
/**
|
|
|
|
* Write all collected results to the file FLAGS_writePath[0]/dm.json.
|
|
|
|
*/
|
|
|
|
static void DumpJson();
|
2015-01-27 22:46:26 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Read JSON file at path written by DumpJson, calling callback for each
|
|
|
|
* BitmapResult recorded in the file. Return success.
|
|
|
|
*/
|
|
|
|
static bool ReadJson(const char* path, void(*callback)(BitmapResult));
|
2014-11-04 15:21:10 +00:00
|
|
|
};
|
|
|
|
|
2015-01-27 22:46:26 +00:00
|
|
|
|
2014-11-04 15:21:10 +00:00
|
|
|
} // namespace DM
|
|
|
|
#endif // DMJsonWriter_DEFINED
|