From 880914c35c8f7fc2e9c57134134c883baf66e538 Mon Sep 17 00:00:00 2001 From: tfarina Date: Mon, 9 Jun 2014 12:05:34 -0700 Subject: Reland "Clean up Test's resourcePath code." This relands commit 91359bed48bc006a4319da86eb26db3b2e6d4afb (Clean up Test's resourcePath code." BUG=None TEST=make dm && out/Debug/dm R=mtklein@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/321723002 --- tests/Test.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/Test.cpp') diff --git a/tests/Test.cpp b/tests/Test.cpp index e57427a354..b904d5a76d 100644 --- a/tests/Test.cpp +++ b/tests/Test.cpp @@ -1,10 +1,10 @@ - /* * 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 "Test.h" #include "SkCommandLineFlags.h" @@ -41,6 +41,8 @@ void Reporter::endTest(Test* test) { /////////////////////////////////////////////////////////////////////////////// +const char* Test::gResourcePath; + Test::Test() : fReporter(NULL), fPassed(true) {} Test::~Test() { @@ -121,8 +123,9 @@ SkString Test::GetTmpDir() { return SkString(tmpDir); } -static const char* gResourcePath = NULL; -void Test::SetResourcePath(const char* resourcePath) { gResourcePath = resourcePath; } +void Test::SetResourcePath(const char* resourcePath) { + gResourcePath = resourcePath; +} SkString Test::GetResourcePath() { return SkString(gResourcePath); -- cgit v1.2.3