fix webgpu test launch

microsoft · Sep 13, 2022 · 86d8d3a · 86d8d3a
1 parent e104d17
commit 86d8d3a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/js/web/karma.conf.js b/js/web/karma.conf.js
@@ -83,8 +83,7 @@ module.exports = function (config) {
       ChromeTest: { base: 'ChromeHeadless', flags: ['--enable-features=SharedArrayBuffer'] },
       ChromePerf: { base: 'Chrome', flags: ['--window-size=1,1', '--enable-features=SharedArrayBuffer'] },
       ChromeDebug: { debug: true, base: 'Chrome', flags: ['--remote-debugging-port=9333', '--enable-features=SharedArrayBuffer'] },
-      ChromeCanaryTest: { base: 'ChromeCanaryHeadless', flags: ['--enable-features=SharedArrayBuffer', '--enable-unsafe-webgpu'] },
-      ChromeCanaryPerf: { base: 'ChromeCanary', flags: ['--window-size=1,1', '--enable-features=SharedArrayBuffer', '--enable-unsafe-webgpu'] },
+      ChromeCanaryTest: { base: 'ChromeCanary', flags: ['--window-size=1,1', '--enable-features=SharedArrayBuffer', '--enable-unsafe-webgpu'] },
       ChromeCanaryDebug: { debug: true, base: 'ChromeCanary', flags: ['--remote-debugging-port=9333', '--enable-features=SharedArrayBuffer', '--enable-unsafe-webgpu'] },
 
       //

diff --git a/js/web/script/test-runner-cli.ts b/js/web/script/test-runner-cli.ts
@@ -585,17 +585,21 @@ function getBrowserNameFromEnv(env: TestRunnerCliArgs['env'], mode: 'debug'|'per
 }
 
 function selectChromeBrowser(mode: 'debug'|'perf'|'test', webgpu: boolean) {
-  let browserName = 'Chrome';
   if (webgpu) {
-    browserName += 'Canary';
-  }
-
-  switch (mode) {
-    case 'debug':
-      return browserName + 'Debug';
-    case 'perf':
-      return browserName + 'Perf';
-    default:
-      return browserName + 'Test';
+    switch (mode) {
+      case 'debug':
+        return 'ChromeCanaryDebug';
+      default:
+        return 'ChromeCanaryTest';
+    }
+  } else {
+    switch (mode) {
+      case 'debug':
+        return 'ChromeDebug';
+      case 'perf':
+        return 'ChromePerf';
+      default:
+        return 'ChromeTest';
+    }
   }
 }