diff options
| author |  mtklein <mtklein@chromium.org> | 2015-09-22 11:43:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-22 11:43:53 -0700 |
| commit | cc334b36de5c4508266c322dfa44039d8156dc70 (patch) | |
| tree | 9f2ec865e3f5df42d5a053f9dc95b88c46ecd60e | |
| parent | 31459a4ace0ed0d0e7525f1fa5c223274034ed21 (diff) | |
fix DM?
BUG=skia:
Review URL: https://codereview.chromium.org/1359833005
| -rw-r--r-- | dm/DM.cpp | 5 | ||||
| -rw-r--r-- | tests/StringTest.cpp | 10 |
2 files changed, 14 insertions, 1 deletions
@@ -164,6 +164,11 @@ static SkTHashSet<SkString> gUninterestingHashes; static void gather_uninteresting_hashes() { if (!FLAGS_uninterestingHashesFile.isEmpty()) { SkAutoTUnref<SkData> data(SkData::NewFromFileName(FLAGS_uninterestingHashesFile[0])); + if (!data) { + SkDebugf("WARNING: unable to read uninteresting hashes from %s\n", + FLAGS_uninterestingHashesFile[0]); + return; + } SkTArray<SkString> hashes; SkStrSplit((const char*)data->data(), "\n", &hashes); for (const SkString& hash : hashes) { diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp index 595a0b194a..f621dc96af 100644 --- a/tests/StringTest.cpp +++ b/tests/StringTest.cpp @@ -156,7 +156,7 @@ DEF_TEST(String, reporter) { { SK_Scalar1, "1" }, { -SK_Scalar1, "-1" }, { SK_Scalar1/2, "0.5" }, - #if defined(SK_BUILD_FOR_WIN) && (_MSC_VER < 1900) + #if defined(SK_BUILD_FOR_WIN) && (_MSC_VER < 1900) { 3.4028234e38f, "3.4028235e+038" }, { -3.4028234e38f, "-3.4028235e+038" }, #else @@ -198,4 +198,12 @@ DEF_TEST(String_SkStrSplit, r) { REPORTER_ASSERT(r, results[3].equals("dee")); REPORTER_ASSERT(r, results[4].equals("f")); REPORTER_ASSERT(r, results[5].equals("g")); + + results.reset(); + SkStrSplit("\n", "\n", &results); + REPORTER_ASSERT(r, results.count() == 1); + + results.reset(); + SkStrSplit("", "\n", &results); + REPORTER_ASSERT(r, results.count() == 0); } |