AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move all Linux GCE bots to Debian

Browse Source 
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>
This commit is contained in:
Eric Boren 2017-06-21 13:39:32 -04:00
parent 111f8a9eea
commit 746e2632c6
6 changed files with 324 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/gen_tasks.go
View File

@ -35,7 +35,7 @@ const (
ISOLATE_SVG_NAME = "Housekeeper-PerCommit-IsolateSVG"
DEFAULT_OS = DEFAULT_OS_LINUX
DEFAULT_OS_LINUX = "Ubuntu-14.04"
DEFAULT_OS_LINUX = "Debian-9.0"
// Name prefix for upload jobs.
PREFIX_UPLOAD = "Upload"

616
infra/bots/tasks.json
View File

File diff suppressed because it is too large Load Diff

3
src/pathops/SkOpEdgeBuilder.cpp
View File

@ -306,7 +306,8 @@ bool SkOpEdgeBuilder::walk() {
split->fT[0] = splits[prior].fT[0];
}
int next = index;
while (next < breaks && !splits[next + 1].fCanAdd) {
int breakLimit = SkTMin(breaks, (int) SK_ARRAY_COUNT(splits) - 1);
while (next < breakLimit && !splits[next + 1].fCanAdd) {
++next;
}
if (next > index) {

5
src/sksl/SkSLParser.cpp
View File

@ -100,11 +100,6 @@ Parser::Parser(String text, SymbolTable& types, ErrorReporter& errors)
layoutlex_init(&fLayoutScanner);
fBuffer = sksl_scan_string(text.c_str(), fScanner);
skslset_lineno(1, fScanner);
if (false) {
// avoid unused warning
yyunput(0, nullptr, fScanner);
}
}
Parser::~Parser() {

2
src/sksl/disable_flex_warnings.h
View File

@ -24,3 +24,5 @@
#pragma warning(push)
#pragma warning(disable:4018)
#endif
#define YY_NO_UNPUT

11
tests/RecordTestUtils.h
View File

@ -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; }