diff options
| author |  tfarina <tfarina@chromium.org> | 2014-06-25 10:39:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-25 10:39:02 -0700 |
| commit | 12345aee12daffe96dbc9c77056e797d91c78d3e (patch) | |
| tree | f85ad7786c0fad267f7add21e3aae9f3ef6204ae | |
| parent | 85a08789c0841eead4f09ea996bec4a931198edc (diff) | |
Rename TestSize.cpp to SizeTest.cpp
It is the only file where Test is the prefix rather than the sufix.
This patch fixes that so it matches with the rest of the files
under tests/ directory.
And separate SkISize test into its own DEF_TEST().
BUG=None
TEST=make tests && out/Debug/tests
R=mtklein@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/337783007
| -rw-r--r-- | gyp/tests.gypi | 4 | ||||
| -rw-r--r-- | tests/SizeTest.cpp (renamed from tests/TestSize.cpp) | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gyp/tests.gypi b/gyp/tests.gypi index 9876f18a44..35431bd30b 100644 --- a/gyp/tests.gypi +++ b/gyp/tests.gypi @@ -155,12 +155,13 @@ '../tests/RoundRectTest.cpp', '../tests/RuntimeConfigTest.cpp', '../tests/SHA1Test.cpp', + '../tests/SListTest.cpp', '../tests/ScalarTest.cpp', '../tests/SerializationTest.cpp', '../tests/ShaderImageFilterTest.cpp', '../tests/ShaderOpacityTest.cpp', + '../tests/SizeTest.cpp', '../tests/SkBase64Test.cpp', - '../tests/SListTest.cpp', '../tests/SmallAllocatorTest.cpp', '../tests/SortTest.cpp', '../tests/SrcOverTest.cpp', @@ -171,7 +172,6 @@ '../tests/TArrayTest.cpp', '../tests/TLSTest.cpp', '../tests/TSetTest.cpp', - '../tests/TestSize.cpp', '../tests/TextureCompressionTest.cpp', '../tests/TileGridTest.cpp', '../tests/ToUnicodeTest.cpp', diff --git a/tests/TestSize.cpp b/tests/SizeTest.cpp index 466a628c5c..9800aa29c3 100644 --- a/tests/TestSize.cpp +++ b/tests/SizeTest.cpp @@ -6,9 +6,10 @@ */ #include "SkSize.h" + #include "Test.h" -static void TestISize(skiatest::Reporter* reporter) { +DEF_TEST(ISize, reporter) { SkISize a, b; a.set(0, 0); @@ -31,8 +32,6 @@ static void TestISize(skiatest::Reporter* reporter) { } DEF_TEST(Size, reporter) { - TestISize(reporter); - SkSize a, b; int ix = 5; int iy = 3; |