Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit 42448e4

Browse files
committed
Run tests on Chrome stable and canary
As of Chrome 45, we can run on stable and canary. Karma appears to run these in parallel - I see little difference in wall clock time on my laptop. R=jmesserly@google.com Review URL: https://codereview.chromium.org/1310753007 .
1 parent 06f1905 commit 42448e4

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

karma.conf.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,25 @@ module.exports = function(config) {
8484
flags: [ harmony_flags ],
8585
},
8686

87+
chrome_travis: {
88+
base: 'Chrome',
89+
flags: [ '--no-sandbox', harmony_flags ]
90+
},
91+
8792
chrome_canary_travis: {
8893
base: 'ChromeCanary',
8994
flags: [ '--no-sandbox', harmony_flags ]
9095
},
9196
},
92-
browsers: ['chrome_canary_harmony'],
97+
browsers: ['chrome_harmony', 'chrome_canary_harmony'],
9398

9499
// Continuous Integration mode
95100
// if true, Karma captures browsers, runs the tests and exits
96101
singleRun: false,
97102
};
98103

99104
if (process.env.TRAVIS) {
100-
configuration.browsers = ['chrome_canary_travis'];
105+
configuration.browsers = ['chrome_travis', 'chrome_canary_travis'];
101106
configuration.autoWatch = false;
102107
configuration.logLevel = config.LOG_DEBUG;
103108
configuration.client.captureConsole = true;

0 commit comments

Comments
 (0)