Skip to content

Commit 65674e4

Browse files
committed
[canvaskit] Compile in most gms for testing
The few we omit fail to compile or link. Bug: skia:10812 Change-Id: I660d64b6f9bfe63949a12506d29e9a8d73898e6b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328377 Reviewed-by: Chris Dalton <csmartdalton@google.com>
1 parent 0bb9ec5 commit 65674e4

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

modules/canvaskit/compile_gm.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@ if [[ `uname` != "Linux" ]]; then
145145
STRICTNESS=""
146146
fi
147147

148+
# These gms do not compile or link with the WASM code. Thus, we omit them.
149+
GLOBIGNORE="gm/cgms.cpp:"\
150+
"gm/compressed_textures.cpp:"\
151+
"gm/fiddle.cpp:"\
152+
"gm/xform.cpp:"\
153+
"gm/video_decoder.cpp"
148154
# Emscripten prefers that the .a files go last in order, otherwise, it
149155
# may drop symbols that it incorrectly thinks aren't used. One day,
150156
# Emscripten will use LLD, which may relax this requirement.
@@ -160,10 +166,7 @@ EMCC_DEBUG=1 ${EMCXX} \
160166
--pre-js $BASE_DIR/gm.js \
161167
tools/Resources.cpp \
162168
$BASE_DIR/gm_bindings.cpp \
163-
gm/bleed.cpp \
164-
gm/blurs.cpp \
165-
gm/complexclip.cpp \
166-
gm/gm.cpp \
169+
gm/*.cpp \
167170
$GM_LIB \
168171
$BUILD_DIR/libskshaper.a \
169172
$SHAPER_LIB \

tools/run-wasm-gm-tests/run-wasm-gm-tests.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@
9999
log('hashes loaded');
100100
}
101101

102+
const skip_list = new Set([
103+
// gm names can be added here to skip, if failing.
104+
]);
105+
102106
async function RunGMs(GM) {
103107
const canvas = document.getElementById('gm_canvas');
104108
const ctx = GM.GetWebGLContext(canvas, 2);
@@ -108,6 +112,9 @@
108112
const names = GM.ListGMs();
109113
names.sort();
110114
for (const name of names) {
115+
if (skip_list.has(name)) {
116+
continue;
117+
}
111118
window._log += `Starting ${name}\n`;
112119
const pngAndMetadata = GM.RunGM(grcontext, name);
113120
if (!pngAndMetadata || !pngAndMetadata.hash) {

0 commit comments

Comments
 (0)