From e4fafb146e85cdfcf9d5418597b6818aa0754ada Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 12 Dec 2013 21:11:12 +0000 Subject: Use DEFINE_TESTCLASS_SHORT macro in tests. The three version of DEFINE_TESTCLASS macro is deprecated and thus just use the simple, short one. BUG=None TEST=out/Debug/tests R=mtklein@google.com, bsalomon@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/100113004 git-svn-id: http://skia.googlecode.com/svn/trunk@12653 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/FontNamesTest.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tests/FontNamesTest.cpp') diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp index 42d9ca9f51..adbf81347d 100644 --- a/tests/FontNamesTest.cpp +++ b/tests/FontNamesTest.cpp @@ -6,7 +6,7 @@ */ #include "Test.h" - +#include "TestClassDef.h" #include "SkCommandLineFlags.h" #include "SkFontMgr.h" #include "SkOTTable_name.h" @@ -218,10 +218,7 @@ static void test_systemfonts(skiatest::Reporter* reporter, bool verbose) { DEFINE_bool(verboseFontNames, false, "verbose FontNames test."); -static void TestFontNames(skiatest::Reporter* reporter) { +DEF_TEST(FontNames, reporter) { test_synthetic(reporter, FLAGS_verboseFontNames); test_systemfonts(reporter, FLAGS_verboseFontNames); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("FontNames", FontNamesTestClass, TestFontNames) -- cgit v1.2.3