From aaf07f7ad5fa892911b2f5a5390cdfdb865d74d9 Mon Sep 17 00:00:00 2001 From: eregon Date: Wed, 20 Sep 2017 20:19:54 +0000 Subject: Adapt tools to follow spec/rubyspec => spec/ruby rename * [Misc #13792] [ruby-core:82287] * Prefer test-spec over test-rubyspec in spec/README. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/default.mspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/default.mspec') diff --git a/spec/default.mspec b/spec/default.mspec index 25b80536be..8791058f95 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -4,8 +4,8 @@ if (opt = ENV["RUBYOPT"]) and (opt = opt.dup).sub!(/(?:\A|\s)-w(?=\z|\s)/, '') ENV["RUBYOPT"] = opt end require "./rbconfig" unless defined?(RbConfig) -load File.dirname(__FILE__) + '/rubyspec/default.mspec' -OBJDIR = File.expand_path("spec/rubyspec/optional/capi/ext") +load File.dirname(__FILE__) + '/ruby/default.mspec' +OBJDIR = File.expand_path("spec/ruby/optional/capi/ext") class MSpecScript builddir = Dir.pwd srcdir = ENV['SRCDIR'] @@ -19,7 +19,7 @@ class MSpecScript # The default implementation to run the specs. set :target, File.join(builddir, "miniruby#{config['exeext']}") - set :prefix, File.expand_path('rubyspec', File.dirname(__FILE__)) + set :prefix, File.expand_path('ruby', File.dirname(__FILE__)) set :flags, %W[ -I#{srcdir}/lib #{srcdir}/tool/runruby.rb --archdir=#{Dir.pwd} --extout=#{config['EXTOUT']} -- cgit v1.2.3