diff options
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 |