Revert "Test: New GMs should be nicely named"
This reverts commit 73ec9a09f36ed1e0921c05924b63dcace069f489.
Reason for revert:
broke Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts
ERROR: 'fontmgr_bounds_1_-0.25Win7' is a bad name.
ERROR: 'fontmgr_bounds_0.75_0Win7' is a bad name.
Original change's description:
> Test: New GMs should be nicely named
>
> Motivation:
>
> An issue came up a while back with SkQP where some the JUnit testing
> framework dislikes test names that aren't valid Java identifiers. I am
> currently replacing invalid characters with underscores before giving
> them to JUnit, but that leads to some confusion when trying to grep for
> the name of a failing test.
>
> I propose that going forward, all *new* Skia unit tests and GM names be
> in the form [A-Za-z][A-Za-z0-9_]* to prevent this sort of confusion. We
> won't change 63 existing "bad" tests names.
>
> This Cl encorces that rule with an assertion in DM.
>
> Change-Id: Icedce023cd3127d499fbcdcaea485f1ec9e9196b
> Reviewed-on: https://skia-review.googlesource.com/145365
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
TBR=halcanary@google.com,brianosman@google.com
Change-Id: I28c619ca767dac221a73594c9e7be412ba2c242c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/145560
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 3485197..d86db82 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -36,13 +36,12 @@
#include "SkPngEncoder.h"
#include "SkScan.h"
#include "SkSpinlock.h"
+#include "SkTestFontMgr.h"
#include "SkTHash.h"
#include "SkTaskGroup.h"
-#include "SkTestFontMgr.h"
#include "SkTypeface_win.h"
#include "Test.h"
#include "Timer.h"
-#include "ValidateGMNames.h"
#include "ios_utils.h"
#include "picture_utils.h"
#include "sk_tool_utils.h"
@@ -1354,8 +1353,6 @@
SkAutoGraphics ag;
SkTaskGroup::Enabler enabled(FLAGS_threads);
- ValidateGMNames();
-
if (nullptr == GetResourceAsData("images/color_wheel.png")) {
info("Some resources are missing. Do you need to set --resourcePath?\n");
}