Skip to content

Commit cb1ba16

Browse files
Mike KleinSkia Commit-Bot
authored andcommitted
add -O1 to debug docker builds
I've been failing to repro the attached bug locally, but I did notice that we're missing an -O1 like we usually add to Debug bot builds. Bug: skia:9793, skia:9664 Change-Id: If30ccfd55bad3e49862d453a754ed9fcbed9bbde Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269938 Auto-Submit: Mike Klein <mtklein@google.com> Commit-Queue: Weston Tracey <westont@google.com> Reviewed-by: Weston Tracey <westont@google.com>
1 parent 21f382c commit cb1ba16

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

infra/bots/recipe_modules/build/docker.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ def compile_fn(api, checkout_root, out_dir):
5151
'target_cpu': target_arch,
5252
'werror': True
5353
}
54-
if configuration != 'Debug':
54+
55+
if configuration == 'Debug':
56+
args['extra_cflags'].append('-O1')
57+
else:
5558
args['is_debug'] = False
5659

5760
if 'NoGPU' in extra_tokens:

infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86-Debug-Docker.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86-Debug-Docker/Debug,target=/OUT",
7070
"gcr.io/skia-public/gcc-debian10-x86@sha256:b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203",
7171
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
72-
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10-x86@sha256:b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203\"] extra_ldflags=[] target_cpu=\"x86\" werror=true"
72+
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\",\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10-x86@sha256:b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203\"] extra_ldflags=[] target_cpu=\"x86\" werror=true"
7373
],
7474
"env": {
7575
"CHROME_HEADLESS": "1",

infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Debug-Docker.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86_64-Debug-Docker/Debug,target=/OUT",
7070
"gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c",
7171
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
72-
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] target_cpu=\"x86_64\" werror=true"
72+
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\",\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] target_cpu=\"x86_64\" werror=true"
7373
],
7474
"env": {
7575
"CHROME_HEADLESS": "1",

infra/bots/recipe_modules/build/examples/full.expected/unknown-docker-image.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
" return func(*a, **kw)",
2222
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/api.py\", line 61, in __call__",
2323
" self.compile_fn(self.m, checkout_root, out_dir)",
24-
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 82, in compile_fn",
24+
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 85, in compile_fn",
2525
" raise Exception('Not implemented: ' + api.vars.builder_name)",
2626
"Exception: Not implemented: Build-Unix-GCC-x86_64-Release-Docker"
2727
]

0 commit comments

Comments
 (0)