diff options
| author |  Eric Boren <borenet@google.com> | 2017-06-21 13:39:32 -0400 |
|---|---|---|
| committer | Eric Boren <borenet@google.com> | 2017-06-28 12:38:28 +0000 |
| commit | 746e2632c645fa616e6989787b27a1e6274243e3 (patch) | |
| tree | 383d38ee803a8b92011a6a485334c6b72dfebeb6 /tests | |
| parent | 111f8a9eea6980a70a300e3a8bfd758257310fe2 (diff) | |
Move all Linux GCE bots to Debian
NOTREECHECKS:true
Bug: skia:
Change-Id: I612989c6ce2f309d2f70f896500f73e4baa971a7
Reviewed-on: https://skia-review.googlesource.com/19811
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RecordTestUtils.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/RecordTestUtils.h b/tests/RecordTestUtils.h index 853ee21908..5701dec5d9 100644 --- a/tests/RecordTestUtils.h +++ b/tests/RecordTestUtils.h @@ -33,9 +33,20 @@ static const T* assert_type(skiatest::Reporter* r, const SkRecord& record, int i record.visit(index, reader); REPORTER_ASSERT(r, T::kType == reader.type); REPORTER_ASSERT(r, SkToBool(reader.ptr)); + + // This appears to be a bug in GCC 6.3. There's no problem here. +#if defined(__GNUC__) && !defined(__clang__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wreturn-local-addr" +#endif return reader.ptr; +#if defined(__GNUC__) && !defined(__clang__) + #pragma GCC diagnostic pop +#endif } + + template <typename DrawT> struct MatchType { template <typename T> int operator()(const T&) { return 0; } int operator()(const DrawT&) { return 1; } |