commit 330313a8a8343876ee596da39da06a5d69badd9c
author mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 22 15:37:26 2013 +0000
committer mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 22 15:37:26 2013 +0000
tree 06572dd2cecc561c641b39af8fbcc2d93728b333
parent f68aed33819cbc98a95edeadde1da9303eca7fb2

My clang now doesn't complain about !"foo".

BUG=
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/22875037

git-svn-id: http://skia.googlecode.com/svn/trunk@10874 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/AAClipTest.cpp

diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index 4c4ee60..b507570 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -39,7 +39,7 @@
             wbytes <<= 2;
             break;
         default:
-            SkASSERT(!"unknown mask format");
+            SkDEBUGFAIL("unknown mask format");
             return false;
     }
 

tests/ClampRangeTest.cpp

diff --git a/tests/ClampRangeTest.cpp b/tests/ClampRangeTest.cpp
index dc52071..2462725 100644
--- a/tests/ClampRangeTest.cpp
+++ b/tests/ClampRangeTest.cpp
@@ -65,7 +65,7 @@
         }
         if (range.fCount1 > 0 && fx != range.fFx1) {
             SkDebugf("%x %x\n", fx, range.fFx1);
-            R_ASSERT(!"bad fFx1");
+            R_ASSERT(false); // bad fFx1
             return;
         }
         for (i = 0; i < range.fCount1; i++) {

tests/PathTest.cpp

diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index e6795d6..ed80d41 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -568,13 +568,13 @@
                 srcPts++;
                 break;
             case SkPath::kQuad_Verb:
-                REPORTER_ASSERT(reporter, !"unexpected quad verb");
+                REPORTER_ASSERT_MESSAGE(reporter, false, "unexpected quad verb");
                 break;
             case SkPath::kConic_Verb:
-                REPORTER_ASSERT(reporter, !"unexpected conic verb");
+                REPORTER_ASSERT_MESSAGE(reporter, false, "unexpected conic verb");
                 break;
             case SkPath::kCubic_Verb:
-                REPORTER_ASSERT(reporter, !"unexpected cubic verb");
+                REPORTER_ASSERT_MESSAGE(reporter, false, "unexpected cubic verb");
                 break;
             case SkPath::kClose_Verb:
                 REPORTER_ASSERT(reporter, !firstTime);
@@ -2117,7 +2117,7 @@
                     lastWasClose = true;
                     break;
                 default:
-                    SkASSERT(!"unexpected verb");
+                    SkDEBUGFAIL("unexpected verb");
             }
             expectedVerbs[numIterVerbs++] = nextVerb;
         }
@@ -2170,7 +2170,7 @@
                     lastPt = lastMoveTo;
                     break;
                 default:
-                    SkASSERT(!"unexpected verb");
+                    SkDEBUGFAIL("unexpected verb");
             }
         }
         REPORTER_ASSERT(reporter, numIterPts == numPoints);