pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-11-14 15:20:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Restore concurrency just on OSX

Browse Source
This commit is contained in:
Matt Colyer 2013-12-18 09:47:24 -08:00
parent 471c323ca5
commit dd16aefbb6
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasks/spec-task.coffee
View File

@ -52,6 +52,9 @@ module.exports = (grunt) ->
continue unless isAtomPackage(packagePath) continue unless isAtomPackage(packagePath)
packageSpecQueue.push(packagePath) packageSpecQueue.push(packagePath)
# TODO: Restore concurrency on Windows
packageSpecQueue.concurrency = 1 unless process.platform is 'win32'
packageSpecQueue.drain = -> callback(null, failedPackages) packageSpecQueue.drain = -> callback(null, failedPackages)
runCoreSpecs = (callback) -> runCoreSpecs = (callback) ->
@ -76,13 +79,24 @@ module.exports = (grunt) ->
if process.platform is 'win32' if process.platform is 'win32'
process.stdout.write(fs.readFileSync('ci.log')) process.stdout.write(fs.readFileSync('ci.log'))
fs.unlinkSync('ci.log') fs.unlinkSync('ci.log')
else
# TODO: Restore concurrency on Windows
packageSpecQueue.concurrency = 2
callback(null, error) callback(null, error)
grunt.registerTask 'run-specs', 'Run the specs', -> grunt.registerTask 'run-specs', 'Run the specs', ->
done = @async() done = @async()
startTime = Date.now() startTime = Date.now()
async.series [runCoreSpecs, runPackageSpecs], (error, results) -> # TODO: This should really be parallel on both platforms, however our
# fixtures step on each others toes currently.
if process.platform is 'darwin'
method = async.series
else if process.platform is 'win32'
method = async.parallel
method [runCoreSpecs, runPackageSpecs], (error, results) ->
[coreSpecFailed, failedPackages] = results [coreSpecFailed, failedPackages] = results
elapsedTime = Math.round((Date.now() - startTime) / 100) / 10 elapsedTime = Math.round((Date.now() - startTime) / 100) / 10
grunt.verbose.writeln("Total spec time: #{elapsedTime}s") grunt.verbose.writeln("Total spec time: #{elapsedTime}s")
@ -91,6 +105,7 @@ module.exports = (grunt) ->
grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0 grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0
# TODO: Mark the build as green on Windows until specs pass.
if process.platform is 'darwin' if process.platform is 'darwin'
done(!coreSpecFailed and failedPackages.length == 0) done(!coreSpecFailed and failedPackages.length == 0)
else if process.platform is 'win32' else if process.platform is 'win32'