diff options
| author |  bsalomon <bsalomon@google.com> | 2015-08-06 17:56:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-06 17:56:13 -0700 |
| commit | 9bca52629c16ed6f0960336637e028df4d40142f (patch) | |
| tree | 7ed185d76d95397016f005207def0453db9231c3 /tests/StringTest.cpp | |
| parent | ebc1c10fe1befb4f8025e825d3fb6012c145c593 (diff) | |
Fix StringTest for VS2015
TBR=reed@google.com
Review URL: https://codereview.chromium.org/1280853002
Diffstat (limited to 'tests/StringTest.cpp')
| -rw-r--r-- | tests/StringTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp index 13ee5ec215..af21d861fe 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" }, - #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 @@ -168,8 +168,9 @@ DEF_TEST(String, reporter) { 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")); |