diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-28 09:19:19 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-28 09:19:19 +0000 |
commit | c555bd7f01c531af8d33ed494b278a765381afd9 (patch) | |
tree | ae5c1a149f09b6d46d85b0e6aa12fa2e27613680 /spec/mspec | |
parent | 140daa521228ce3520a75cdc4a26808f8fa3acdb (diff) | |
download | ruby-c555bd7f01c531af8d33ed494b278a765381afd9.tar.gz |
Update to ruby/mspec@c135328
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/mspec')
-rw-r--r-- | spec/mspec/.travis.yml | 3 | ||||
-rw-r--r-- | spec/mspec/tool/sync/sync-rubyspec.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/spec/mspec/.travis.yml b/spec/mspec/.travis.yml index 5b6795c2b2..c710e536fc 100644 --- a/spec/mspec/.travis.yml +++ b/spec/mspec/.travis.yml @@ -1,5 +1,8 @@ sudo: false language: ruby +before_script: + # https://github.com/travis-ci/travis-ci/issues/8408 + - unset _JAVA_OPTIONS script: - bundle exec rspec matrix: diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb index deb7ab54fe..fbd37fe95b 100644 --- a/spec/mspec/tool/sync/sync-rubyspec.rb +++ b/spec/mspec/tool/sync/sync-rubyspec.rb @@ -13,7 +13,6 @@ IMPLS = { mri: { git: "https://github.com/ruby/ruby.git", master: "trunk", - prefix: "spec/rubyspec", merge_message: "Update to ruby/spec@", }, } @@ -71,8 +70,7 @@ class RubyImplementation end def prefix - return "spec/mspec" if MSPEC - @data[:prefix] || "spec/ruby" + MSPEC ? "spec/mspec" : "spec/ruby" end def rebased_branch |