tests/KtxTest.cpp - Issue 346453002: Refactor how we handle resources path in Tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tests/KtxTest.cpp

Issue 346453002: Refactor how we handle resources path in Tests. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fix rebase conflict Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tests/KtxTest.cpp

diff --git a/tests/KtxTest.cpp b/tests/KtxTest.cpp

index 5cec2bf297c2db1ad929b629387372d5f515e29e..e9c4217eadfbe56f9fd09f50b97adcf72ff6d7c1 100644

--- a/tests/KtxTest.cpp

+++ b/tests/KtxTest.cpp

@@ -5,6 +5,7 @@

* found in the LICENSE file.

+#include "Resources.h"

#include "SkBitmap.h"

#include "SkData.h"

#include "SkDecodingImageGenerator.h"

@@ -140,7 +141,7 @@ DEF_TEST(KtxReadUnpremul, reporter) {

* the PKM to the KTX should produce an identical KTX to the one we have on file)

DEF_TEST(KtxReexportPKM, reporter) {

- SkString resourcePath = skiatest::Test::GetResourcePath();

+ SkString resourcePath = GetResourcePath();

SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), "mandrill_128.pkm");

// Load PKM file into a bitmap

« no previous file with comments | « tests/ImageDecodingTest.cpp ('k') | tests/Test.h » ('j') | no next file with comments »