SkQP: revert change that broke something

reverts c1b131195b & b52c273d3f

CQ_INCLUDE_TRYBOTS=skia.primary:Test-Debian9-Clang-NUC7i5BNK-CPU-Emulator-x86-devrel-All-Android_SKQP

Change-Id: I9efa459cdda63fae0aff75207a01128a642d0a42
Reviewed-on: https://skia-review.googlesource.com/c/170101
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2018-11-09 09:48:40 -05:00 committed by Skia Commit-Bot
parent 6a2c42f893
commit b07ed8fb07
2 changed files with 0 additions and 13 deletions

View File

@ -176,22 +176,10 @@ private:
} \
} while (0)
#ifdef SK_DO_NOT_REGISTER_NONGPU_UNIT_TESTS
namespace skiatest {
struct NonRegister {
NonRegister(TestProc) {}
};
}
#define DEF_TEST(name, reporter) \
static void test_##name(skiatest::Reporter*, const GrContextOptions&); \
static skiatest::NonRegister name##_NonTestRegistry(test_##name); \
void test_##name(skiatest::Reporter* reporter, const GrContextOptions&)
#else
#define DEF_TEST(name, reporter) \
static void test_##name(skiatest::Reporter*, const GrContextOptions&); \
skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
void test_##name(skiatest::Reporter* reporter, const GrContextOptions&)
#endif
#define DEF_GPUTEST(name, reporter, options) \
static void test_##name(skiatest::Reporter*, const GrContextOptions&); \

View File

@ -24,7 +24,6 @@ skia_use_lua = false
skia_use_piex = false
skia_skqp_enable_driver_correctness_workarounds = {enable_workarounds}
skia_tools_require_resources = true
extra_cflags = [ "-DSK_DO_NOT_REGISTER_NONGPU_UNIT_TESTS" ]
'''
def parse_args():