diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-27 11:37:19 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-27 11:37:19 +0000 |
commit | 80fdfbf8099d8e802b9faaef2eda1ffdb787d1ce (patch) | |
tree | abe4d154d7577229a0b0eb48d358ae6d542cf7e3 /spec/mspec/tool/sync | |
parent | cbbe2fab8255223f2898489365b16a72d2c02946 (diff) | |
download | ruby-80fdfbf8099d8e802b9faaef2eda1ffdb787d1ce.tar.gz |
Update to ruby/mspec@7074b56
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/mspec/tool/sync')
-rw-r--r-- | spec/mspec/tool/sync/sync-rubyspec.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb index 13e9120b36..4a15b8e4ad 100644 --- a/spec/mspec/tool/sync/sync-rubyspec.rb +++ b/spec/mspec/tool/sync/sync-rubyspec.rb @@ -159,22 +159,22 @@ end def test_new_specs require "yaml" Dir.chdir(SOURCE_REPO) do - if MSPEC - sh "bundle", "exec", "rspec" - else - versions = YAML.load_file(".travis.yml") - versions = versions["matrix"]["include"].map { |job| job["rvm"] } - versions.delete "ruby-head" - min_version, max_version = versions.minmax - - run_rubyspec = -> version { - command = "chruby #{version} && ../mspec/bin/mspec -j" - sh ENV["SHELL"], "-c", command - } - run_rubyspec[min_version] - run_rubyspec[max_version] - run_rubyspec["trunk"] - end + versions = YAML.load_file(".travis.yml") + versions = versions["matrix"]["include"].map { |job| job["rvm"] } + versions.delete "ruby-head" + versions.delete "system" + min_version, max_version = versions.minmax + + test_command = MSPEC ? "bundle exec rspec" : "../mspec/bin/mspec -j" + + run_test = -> version { + command = "chruby #{version} && #{test_command}" + sh ENV["SHELL"], "-c", command + } + + run_test[min_version] + run_test[max_version] + run_test["trunk"] end end |