Skip to content

Commit ba615e8

Browse files
Nathaniel NifongSkia Commit-Bot
authored andcommitted
Fixes for canvaskit karma tests in google3
Change-Id: I4945f99016ed7424ed0fe8cca1f0006396a1ad44 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317857 Reviewed-by: Kevin Lubick <[email protected]> Commit-Queue: Nathaniel Nifong <[email protected]>
1 parent 443d2c1 commit ba615e8

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

modules/canvaskit/karma.google3.conf.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ module.exports = function(config) {
88
config.files.unshift(
99
// pattern is a path relative to google3 root referring to any file
1010
// provided by a target in the data attribute of the js_library of the test.
11-
{ pattern: 'third_party/skia/HEAD/modules/canvaskit/minimal_skottie_wasm/minimal_skottie_cc.wasm', included:false, served:true},
12-
{ pattern: 'third_party/skia/HEAD/modules/canvaskit/minimal_skottie_wasm/minimal_skottie_cc.js', included:true, served:false},
13-
{ pattern: 'third_party/skia/HEAD/modules/canvaskit/tests/assets/animated_gif.json', included:false, served:true},
11+
{ pattern: 'third_party/skia/HEAD/modules/canvaskit/tests/util.js', included:true, served:false},
12+
{ pattern: 'third_party/skia/HEAD/modules/canvaskit/canvaskit_wasm/canvaskit_cc.wasm', included:false, served:true},
13+
{ pattern: 'third_party/skia/HEAD/modules/canvaskit/canvaskit_wasm/canvaskit_cc.js', included:true, served:false},
14+
{ pattern: 'third_party/skia/HEAD/modules/canvaskit/tests/assets/*', included:false, served:true},
1415
);
1516

1617
// proxies have the following form
1718
// {'/dir-to-serve/': '/base/dir-relative-to-google3-root'}
18-
config.proxies['/canvaskit/'] = '/base/third_party/skia/HEAD/modules/canvaskit/minimal_skottie_wasm/';
19+
config.proxies['/canvaskit/'] = '/base/third_party/skia/HEAD/modules/canvaskit/canvaskit_wasm/';
1920
config.proxies['/assets/'] = '/base/third_party/skia/HEAD/modules/canvaskit/tests/assets/';
2021
};

modules/canvaskit/tests/skottie.spec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ describe('Skottie behavior', () => {
3434
console.warn('Skipping test because not compiled with skottie');
3535
return;
3636
}
37+
expect(promises[1]).not.toBe('NOT FOUND');
3738
const animation = CanvasKit.MakeManagedAnimation(promises[1], {
3839
'flightAnim.gif': promises[0],
3940
});
@@ -63,6 +64,7 @@ describe('Skottie behavior', () => {
6364
console.warn('Skipping test because not compiled with skottie');
6465
return;
6566
}
67+
expect(promises[0]).not.toBe('NOT FOUND');
6668
const bounds = CanvasKit.LTRBRect(0, 0, 500, 500);
6769
canvas.clear(CanvasKit.WHITE);
6870

0 commit comments

Comments
 (0)