commit 94ed3ab33dd02c4f212ab514ddcb59810b2c5a4a
author Brian Salomon <bsalomon@google.com> Fri Aug 21 12:39:33 2020 -0400
committer Yi Kong <yikong@google.com> Thu Dec 16 06:40:10 2021 +0000
tree 2b1dc885c6294be1650dec0bc9d69428a931a71c
parent 81c069525ee8c577ddd32990837584a3341ee737

[BACKPORT] Fix -Wstring-concatenation warnings in clang 12

Change-Id: Ic09346b6079e6f316c28e03ddb02f12b4af8a38d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/312482
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/CodecTest.cpp

diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index 8c918a8..3ce239e 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -265,7 +265,7 @@
 
 static bool supports_partial_scanlines(const char path[]) {
     static const char* const exts[] = {
-        "jpg", "jpeg", "png", "webp"
+        "jpg", "jpeg", "png", "webp",
         "JPG", "JPEG", "PNG", "WEBP"
     };
 

tests/PDFDocumentTest.cpp

diff --git a/tests/PDFDocumentTest.cpp b/tests/PDFDocumentTest.cpp
index 95821e8..0d8e0a2 100644
--- a/tests/PDFDocumentTest.cpp
+++ b/tests/PDFDocumentTest.cpp
@@ -211,10 +211,10 @@
     }
     sk_sp<SkData> data(wStream.detachAsData());
     static const char* expectations[] = {
-        "<</Title <FEFFD835DCD0D835DCD1D835DCD2D835DCD3D835DCD40020"
-            "D835DCD5D835DCD6D835DCD7D835DCD8D835DCD9>",
-        "/Author (ABCDE FGHIJ)",
-        "Subject <FEFF03B103B203B303B403B5002003B603B703B803B903BA>",
+        ("<</Title <FEFFD835DCD0D835DCD1D835DCD2D835DCD3D835DCD40020"
+            "D835DCD5D835DCD6D835DCD7D835DCD8D835DCD9>"),
+         "/Author (ABCDE FGHIJ)",
+         "Subject <FEFF03B103B203B303B403B5002003B603B703B803B903BA>",
     };
     for (const char* expectation : expectations) {
         if (!contains(data->bytes(), data->size(), expectation)) {

tests/PathTest.cpp

diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 0668098..f03dd55 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -4911,10 +4911,10 @@
 
 DEF_TEST(AndroidArc, reporter) {
     const char* tests[] = {
-        "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z",
-        "M50,0L92,0 A8,8,0,0 1 100,8 L100,92 A8,8,0,0 1 92,100 L8,100"
-            " A8,8,0,0 1 0,92 L 0,8 A8,8,0,0 1 8,0z",
-        "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"
+         "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z",
+        ("M50,0L92,0 A8,8,0,0 1 100,8 L100,92 A8,8,0,0 1 92,100 L8,100"
+            " A8,8,0,0 1 0,92 L 0,8 A8,8,0,0 1 8,0z"),
+         "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"
     };
     for (auto test : tests) {
         SkPath aPath;