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

Unified Diff: karma.conf.js

Issue 1096253002: Travis workaround (Closed) Base URL: https://github.com/dart-lang/dev_compiler.git@master
Patch Set: Created 5 years, 8 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 | « .travis.yml ('k') | 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 a63c7ca2515e80415c0789684ece703346c055ec..000ec0dcb65b868f976947a0aa0030bfc5a114f3 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -2,7 +2,7 @@
// Generated on Mon Apr 20 2015 06:33:20 GMT-0700 (PDT)
module.exports = function(config) {
- config.set({
+ var configuration = {
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',
@@ -50,7 +50,7 @@ module.exports = function(config) {
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
- logLevel: config.LOG_INFO,
+ logLevel: config.LOG_DEBUG,
// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,
@@ -82,5 +82,11 @@ module.exports = function(config) {
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: false,
- });
+ };
+
+ if (process.env.TRAVIS) {
+ configuration.browsers = ['chrome_travis'];
+ }
+
+ config.set(configuration);
};
« no previous file with comments | « .travis.yml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698