0ee2627026
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
83 lines
2.4 KiB
C++
83 lines
2.4 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "DMJsonWriter.h"
|
|
|
|
#include "SkCommonFlags.h"
|
|
#include "SkJSONCPP.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkStream.h"
|
|
#include "SkTArray.h"
|
|
#include "SkThread.h"
|
|
|
|
namespace DM {
|
|
|
|
SkTArray<JsonWriter::BitmapResult> gBitmapResults;
|
|
SK_DECLARE_STATIC_MUTEX(gBitmapResultLock);
|
|
|
|
void JsonWriter::AddBitmapResult(const BitmapResult& result) {
|
|
SkAutoMutexAcquire lock(&gBitmapResultLock);
|
|
gBitmapResults.push_back(result);
|
|
}
|
|
|
|
SkTArray<skiatest::Failure> gFailures;
|
|
SK_DECLARE_STATIC_MUTEX(gFailureLock);
|
|
|
|
void JsonWriter::AddTestFailure(const skiatest::Failure& failure) {
|
|
SkAutoMutexAcquire lock(gFailureLock);
|
|
gFailures.push_back(failure);
|
|
}
|
|
|
|
void JsonWriter::DumpJson() {
|
|
if (FLAGS_writePath.isEmpty()) {
|
|
return;
|
|
}
|
|
|
|
Json::Value root;
|
|
|
|
for (int i = 1; i < FLAGS_properties.count(); i += 2) {
|
|
root[FLAGS_properties[i-1]] = FLAGS_properties[i];
|
|
}
|
|
for (int i = 1; i < FLAGS_key.count(); i += 2) {
|
|
root["key"][FLAGS_key[i-1]] = FLAGS_key[i];
|
|
}
|
|
|
|
{
|
|
SkAutoMutexAcquire lock(&gBitmapResultLock);
|
|
for (int i = 0; i < gBitmapResults.count(); i++) {
|
|
Json::Value result;
|
|
result["key"]["name"] = gBitmapResults[i].name.c_str();
|
|
result["key"]["config"] = gBitmapResults[i].config.c_str();
|
|
result["key"]["mode"] = gBitmapResults[i].mode.c_str();
|
|
result["options"]["source_type"] = gBitmapResults[i].sourceType.c_str();
|
|
result["md5"] = gBitmapResults[i].md5.c_str();
|
|
|
|
root["results"].append(result);
|
|
}
|
|
}
|
|
|
|
{
|
|
SkAutoMutexAcquire lock(gFailureLock);
|
|
for (int i = 0; i < gFailures.count(); i++) {
|
|
Json::Value result;
|
|
result["file_name"] = gFailures[i].fileName;
|
|
result["line_no"] = gFailures[i].lineNo;
|
|
result["condition"] = gFailures[i].condition;
|
|
result["message"] = gFailures[i].message.c_str();
|
|
|
|
root["test_results"]["failures"].append(result);
|
|
}
|
|
}
|
|
|
|
SkString path = SkOSPath::Join(FLAGS_writePath[0], "dm.json");
|
|
SkFILEWStream stream(path.c_str());
|
|
stream.writeText(Json::StyledWriter().write(root).c_str());
|
|
stream.flush();
|
|
}
|
|
|
|
} // namespace DM
|