Fix StringTest for VS2015

tests/StringTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <stdarg.h>
 #include <stdio.h>
 #include "SkString.h"
@@ skipping 138 matching lines @@
     REPORTER_ASSERT(reporter, a.equals("000000016777216"));
 
     static const struct {
         SkScalar    fValue;
         const char* fString;
     } gRec[] = {
         { 0,            "0" },
         { SK_Scalar1,   "1" },
         { -SK_Scalar1,  "-1" },
         { SK_Scalar1/2, "0.5" },
-  #ifdef SK_BUILD_FOR_WIN
+  #if defined(SK_BUILD_FOR_WIN) && (_MSC_VER < 1900) 
         { 3.4028234e38f,   "3.4028235e+038" },
         { -3.4028234e38f, "-3.4028235e+038" },
   #else
         { 3.4028234e38f,   "3.4028235e+38" },
         { -3.4028234e38f, "-3.4028235e+38" },
   #endif
     };
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) {
         a.reset();
         a.appendScalar(gRec[i].fValue);
         REPORTER_ASSERT(reporter, a.size() <= SkStrAppendScalar_MaxSize);
-//        SkDebugf(" received <%s> expected <%s>\n", a.c_str(), gRec[i].fString);
-        REPORTER_ASSERT(reporter, a.equals(gRec[i].fString));
+        if (!a.equals(gRec[i].fString)) {
+            ERRORF(reporter, "received <%s> expected <%s>\n", a.c_str(), gRec[i].fString);
+        }
     }
 
     REPORTER_ASSERT(reporter, SkStringPrintf("%i", 0).equals("0"));
 
     char buffer [40];
     memset(buffer, 'a', 40);
     REPORTER_ASSERT(reporter, buffer[18] == 'a');
     REPORTER_ASSERT(reporter, buffer[19] == 'a');
     REPORTER_ASSERT(reporter, buffer[20] == 'a');
     printfAnalog(buffer, 20, "%30d", 0);
     REPORTER_ASSERT(reporter, buffer[18] == ' ');
     REPORTER_ASSERT(reporter, buffer[19] == 0);
     REPORTER_ASSERT(reporter, buffer[20] == 'a');
 
 }
 
 DEF_TEST(String_SkStrSplit, r) {
     SkTArray<SkString> results;
 
     SkStrSplit("a-_b_c-dee--f-_-_-g-", "-_", &results);
     REPORTER_ASSERT(r, results.count() == 6);
     REPORTER_ASSERT(r, results[0].equals("a"));
     REPORTER_ASSERT(r, results[1].equals("b"));
     REPORTER_ASSERT(r, results[2].equals("c"));
     REPORTER_ASSERT(r, results[3].equals("dee"));
     REPORTER_ASSERT(r, results[4].equals("f"));
     REPORTER_ASSERT(r, results[5].equals("g"));
 }