diff options
| author | Timo Tijhof <krinklemail@gmail.com> | 2015-02-20 04:42:29 +0000 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2015-02-20 11:16:48 -0500 |
| commit | 2e1481c4335f38d140968cf6dca5aa6ac630e268 (patch) | |
| tree | bc6a3491588da1be0bd26e20af7a2cbdb01800fa | |
| parent | db4083651e48a957bd7ea21f58ba2d8dac8459ed (diff) | |
| download | jquery-ui-1-9-stable.tar.gz jquery-ui-1-9-stable.zip | |
Build: Use browserSets from testswarm config1-9-stable
It's already in jQuery's Jenkins node-testswarm config
(and set to the same value) but not used yet.
Reference it to make sure it keeps working in the future.
Closes gh-1452
(cherry picked from commit 1e7a1e811f7c9d624b2561ea3e2f34f80773ad0c)
(cherry picked from commit 258dbe3ae481b74c056e6445bd1aaaface9d6c48)
Conflicts:
build/tasks/testswarm.js
(cherry picked from commit 1d30b8051b4d92dcd42cd856a1fbcc24a1ec42d0)
| -rw-r--r-- | build/tasks/testswarm.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index d724aafcc..558aac4e6 100644 --- a/build/tasks/testswarm.js +++ b/build/tasks/testswarm.js @@ -61,7 +61,8 @@ function submit( commit, runs, configFile, extra, done ) { name: "Commit <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra, runs: runs, runMax: config.runMax, - browserSets: ["popular-ui"] + browserSets: config.browserSets, + timeout: 1000 * 60 * 30 }, function( error, passed ) { if ( error ) { grunt.log.error( error ); |