aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-03-16 08:37:19 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-16 08:37:19 -0700
commit935f1b1a20f673b81e78bec913cd702ffc793c99 (patch)
tree00ca0df10256e89d9866388c69a8bd472f4d735e /dm
parentc161310ffdbbcb3b023da2e375faefd211fa52e8 (diff)
Split uninteresting hash lines correctly on Windows.
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index d558e08ca6..6748544eca 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -262,6 +262,12 @@ static void gather_gold() {
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+#if defined(SK_BUILD_FOR_WIN32)
+ static const char* kNewline = "\r\n";
+#else
+ static const char* kNewline = "\n";
+#endif
+
static SkTHashSet<SkString> gUninterestingHashes;
static void gather_uninteresting_hashes() {
@@ -273,7 +279,7 @@ static void gather_uninteresting_hashes() {
return;
}
SkTArray<SkString> hashes;
- SkStrSplit((const char*)data->data(), "\n", &hashes);
+ SkStrSplit((const char*)data->data(), kNewline, &hashes);
for (const SkString& hash : hashes) {
gUninterestingHashes.add(hash);
}