From 458cd0bf2f4cc3c2f7f9981bf8c1ee57e306947e Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Sat, 11 Apr 2015 15:05:49 +0200
Subject: [PATCH] Revert "Avoid specs to trip up on each other"

This reverts commit 756ce8cea65c75f4a6f2dc0a33f7c80108df3828.
---
 .travis.yml                  | 2 +-
 build/tasks/spec-task.coffee | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9deccde61..2372e62b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/build/tasks/spec-task.coffee b/build/tasks/spec-task.coffee
index da3c67df4..da5b24685 100644
--- a/build/tasks/spec-task.coffee
+++ b/build/tasks/spec-task.coffee
@@ -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) ->