diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-07-01 12:10:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-01 12:10:45 +0200 |
| commit | f666fb58a3d7b56461d9aac04411022aaa86c0c7 (patch) | |
| tree | 4a1fff06d7ad57a3bd15060679408e76779ef442 | |
| parent | b1d27355339417b26263cb26540b987be516aed0 (diff) | |
| parent | 243c856ce9c9329edbd482e18600a602654a75ec (diff) | |
| download | rails-f666fb58a3d7b56461d9aac04411022aaa86c0c7.tar.gz rails-f666fb58a3d7b56461d9aac04411022aaa86c0c7.tar.bz2 rails-f666fb58a3d7b56461d9aac04411022aaa86c0c7.zip | |
Merge pull request #33267 from utilum/railties_testopts
Fix assignment of TESTOPTS in railties test task
| -rw-r--r-- | railties/Rakefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index f918329df3..e1be0ceb40 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -31,6 +31,8 @@ namespace :test do failing_files = [] dirs = (ENV["TEST_DIR"] || ENV["TEST_DIRS"] || "**").split(",") + test_options = ENV["TESTOPTS"].to_s.split(/[\s]+/) + test_files = dirs.map { |dir| "test/#{dir}/*_test.rb" } Dir[*test_files].each do |file| next true if file.start_with?("test/fixtures/") @@ -46,7 +48,7 @@ namespace :test do # We could run these in parallel, but pretty much all of the # railties tests already run in parallel, so ¯\_(⊙︿⊙)_/¯ Process.waitpid fork { - ARGV.clear.push ENV["TESTOPTS"] + ARGV.clear.concat test_options Rake.application = nil load file |