diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-01-12 15:55:47 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-01-12 15:55:47 -0800 |
| commit | 7b7b12f5983fd0c48e4a8dad909d3388b72f046c (patch) | |
| tree | bf2a82478f3a20c32999bbc75438044829270f44 /actionpack/test | |
| parent | b64b7545106db0744c054ef615a952fa1e962e60 (diff) | |
| download | rails-7b7b12f5983fd0c48e4a8dad909d3388b72f046c.tar.gz rails-7b7b12f5983fd0c48e4a8dad909d3388b72f046c.tar.bz2 rails-7b7b12f5983fd0c48e4a8dad909d3388b72f046c.zip | |
do not run in parallel on travis
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 604ba267d6..1ef10ff956 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -20,7 +20,11 @@ rescue LoadError puts "'drb/unix' is not available" end -PROCESS_COUNT = (ENV['N'] || 4).to_i +if ENV['TRAVIS'] + PROCESS_COUNT = 0 +else + PROCESS_COUNT = (ENV['N'] || 4).to_i +end require 'active_support/testing/autorun' require 'abstract_controller' |