mirror of
https://github.com/atom/atom.git
synced 2026-01-25 06:48:28 -05:00
Revert "Avoid specs to trip up on each other"
This reverts commit 756ce8cea6.
This commit is contained in:
@@ -14,7 +14,7 @@ install:
|
||||
- if [ $TRAVIS_OS_NAME == "linux" ]; then
|
||||
sudo apt-get install build-essential git libgnome-keyring-dev fakeroot;
|
||||
export DISPLAY=:99.0;
|
||||
sh -e /etc/init.d/xvfb start -- :99 -screen 0 1024x768x24 -ac +extension GLX +extension RANDR +render -noreset;
|
||||
sh -e /etc/init.d/xvfb start;
|
||||
fi
|
||||
|
||||
script: script/cibuild
|
||||
|
||||
@@ -4,7 +4,7 @@ path = require 'path'
|
||||
_ = require 'underscore-plus'
|
||||
async = require 'async'
|
||||
|
||||
concurrency = 1
|
||||
concurrency = 2
|
||||
|
||||
module.exports = (grunt) ->
|
||||
{isAtomPackage, spawn} = require('./task-helpers')(grunt)
|
||||
@@ -78,7 +78,7 @@ module.exports = (grunt) ->
|
||||
continue unless isAtomPackage(packagePath)
|
||||
packageSpecQueue.push(packagePath)
|
||||
|
||||
packageSpecQueue.concurrency = concurrency
|
||||
packageSpecQueue.concurrency = concurrency - 1
|
||||
packageSpecQueue.drain = -> callback(null, failedPackages)
|
||||
|
||||
runCoreSpecs = (callback) ->
|
||||
@@ -122,9 +122,9 @@ module.exports = (grunt) ->
|
||||
|
||||
# TODO: This should really be parallel on both platforms, however our
|
||||
# fixtures step on each others toes currently.
|
||||
if process.platform is 'darwin'
|
||||
if process.platform in ['darwin', 'linux']
|
||||
method = async.parallel
|
||||
else if process.platform in ['win32', 'linux']
|
||||
else if process.platform is 'win32'
|
||||
method = async.series
|
||||
|
||||
method [runCoreSpecs, runPackageSpecs], (error, results) ->
|
||||
|
||||
Reference in New Issue
Block a user