[前][次][番号順一覧][スレッド一覧]

ruby-changes:47936

From: eregon <ko1@a...>
Date: Thu, 28 Sep 2017 18:19:25 +0900 (JST)
Subject: [ruby-changes:47936] eregon:r60050 (trunk): Update to ruby/mspec@c135328

eregon	2017-09-28 18:19:19 +0900 (Thu, 28 Sep 2017)

  New Revision: 60050

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60050

  Log:
    Update to ruby/mspec@c135328

  Modified files:
    trunk/spec/mspec/.travis.yml
    trunk/spec/mspec/tool/sync/sync-rubyspec.rb
Index: spec/mspec/.travis.yml
===================================================================
--- spec/mspec/.travis.yml	(revision 60049)
+++ spec/mspec/.travis.yml	(revision 60050)
@@ -1,5 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/.travis.yml#L1
 sudo: false
 language: ruby
+before_script:
+  # https://github.com/travis-ci/travis-ci/issues/8408
+  - unset _JAVA_OPTIONS
 script:
   - bundle exec rspec
 matrix:
Index: spec/mspec/tool/sync/sync-rubyspec.rb
===================================================================
--- spec/mspec/tool/sync/sync-rubyspec.rb	(revision 60049)
+++ spec/mspec/tool/sync/sync-rubyspec.rb	(revision 60050)
@@ -13,7 +13,6 @@ IMPLS = { https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L13
   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 https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L70
   end
 
   def prefix
-    return "spec/mspec" if MSPEC
-    @data[:prefix] || "spec/ruby"
+    MSPEC ? "spec/mspec" : "spec/ruby"
   end
 
   def rebased_branch

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]