diff options
| author |  Brian Osman <brianosman@google.com> | 2017-08-10 10:23:25 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-10 15:42:25 +0000 |
| commit | 71a1889a1432715e515e000f1f4ef277e90e9ae1 (patch) | |
| tree | 5965dc540193f8e9d6add43928a0985eb24bb389 /tests | |
| parent | 47238c79c4dd61c8770f45fc36d0cdbaea00b3e2 (diff) | |
Revert "Revert "GrContext::dump that produces JSON formatted output""
This reverts commit 0f450acd76fd58a2f7464f99869ed6afbfac303c.
Bug: skia:
Change-Id: I97428fbbc6d82bf8b186ec5fdbf1a939c00e4126
Reviewed-on: https://skia-review.googlesource.com/32726
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GrContextFactoryTest.cpp | 6 | ||||
| -rw-r--r-- | tests/GrDrawTargetTest.cpp | 23 |
2 files changed, 6 insertions, 23 deletions
diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index d4d5667152..098b2d61a9 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -139,4 +139,10 @@ DEF_GPUTEST(GrContextFactory_sharedContexts, reporter, /*factory*/) { } } +DEF_GPUTEST_FOR_ALL_CONTEXTS(GrContextDump, reporter, ctxInfo) { + // Ensure that GrContext::dump doesn't assert (which is possible, if the JSON code is wrong) + SkString result = ctxInfo.grContext()->dump(); + REPORTER_ASSERT(reporter, !result.isEmpty()); +} + #endif diff --git a/tests/GrDrawTargetTest.cpp b/tests/GrDrawTargetTest.cpp deleted file mode 100644 index c8492bc3ad..0000000000 --- a/tests/GrDrawTargetTest.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "Test.h" -#if SK_SUPPORT_GPU - -#include "GrCaps.h" -#include "GrContext.h" -#include "GrGpu.h" - -DEF_GPUTEST_FOR_ALL_CONTEXTS(GrDrawTargetPrint, reporter, ctxInfo) { - // This used to assert. - SkString result = ctxInfo.grContext()->caps()->dump(); - SkASSERT(!result.isEmpty()); - SkString shaderResult = ctxInfo.grContext()->caps()->shaderCaps()->dump(); - SkASSERT(!shaderResult.isEmpty()); -} - -#endif |