Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1161)

Unified Diff: karma.conf.js

Issue 1310753007: Run tests on Chrome stable and canary (Closed) Base URL: https://github.com/dart-lang/dev_compiler.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: karma.conf.js
diff --git a/karma.conf.js b/karma.conf.js
index 424762d9dbeaa3a69a2f1565a9268044961726fb..33aa50d562b5712e4832ba727c7095272c7fd5a3 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -84,12 +84,17 @@ module.exports = function(config) {
flags: [ harmony_flags ],
},
+ chrome_travis: {
+ base: 'Chrome',
+ flags: [ '--no-sandbox', harmony_flags ]
+ },
+
chrome_canary_travis: {
base: 'ChromeCanary',
flags: [ '--no-sandbox', harmony_flags ]
},
},
- browsers: ['chrome_canary_harmony'],
+ browsers: ['chrome_harmony', 'chrome_canary_harmony'],
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
@@ -97,7 +102,7 @@ module.exports = function(config) {
};
if (process.env.TRAVIS) {
- configuration.browsers = ['chrome_canary_travis'];
+ configuration.browsers = ['chrome_travis', 'chrome_canary_travis'];
configuration.autoWatch = false;
configuration.logLevel = config.LOG_DEBUG;
configuration.client.captureConsole = true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698