summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-24 07:41:14 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-24 07:41:14 +0000
commit10887fce423d263194fbd5f4cc04afbc76c16738 (patch)
tree3936ba31ab61cee8ff541a016923f080b3f04845 /spec
parent967f56114a2ea9955005765235c9f43863d1413e (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_0_0@50069 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 c4b75f614a..e45526c7ac 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -1,4 +1,4 @@
-load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec'
+load File.dirname(__FILE__) + '/rubyspec/default.mspec'
class MSpecScript
builddir = Dir.pwd
srcdir = ENV['SRCDIR']