summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-22 03:39:38 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-22 03:39:38 +0000
commitb8f4796ac51d057712138e39bd2209e7b613e1d7 (patch)
treeb6eca0cd897644369f8cb7019497b03e479e86ed /spec
parentfb72edcedfef116e499795586951389392f68d02 (diff)
merge revision(s) 49689,49752,49753: [Backport #10953]
* common.mk: use ruby organization for rubyspec. * spec/default.mspec: remove specific version number. https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714 * spec/default.mspec: use default configuration file name. https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec')
-rw-r--r--spec/default.mspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/default.mspec b/spec/default.mspec
index 0506f1d86a..47f5dd12e5 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -1,4 +1,4 @@
-load File.dirname(__FILE__) + '/rubyspec/ruby.2.2.mspec'
+load File.dirname(__FILE__) + '/rubyspec/default.mspec'
class MSpecScript
builddir = Dir.pwd
srcdir = ENV['SRCDIR']