ruby-changes:9712
From: yugui <ko1@a...>
Date: Thu, 1 Jan 2009 22:30:49 +0900 (JST)
Subject: [ruby-changes:9712] Ruby:r21253 (trunk, ruby_1_9_1): * spec/default.mspec: fix for builddir != srcdir
yugui 2009-01-01 22:30:25 +0900 (Thu, 01 Jan 2009) New Revision: 21253 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21253 Log: * spec/default.mspec: fix for builddir != srcdir * Makefile.in: ditto. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/Makefile.in branches/ruby_1_9_1/spec/default.mspec trunk/ChangeLog trunk/Makefile.in trunk/spec/default.mspec Index: ChangeLog =================================================================== --- ChangeLog (revision 21252) +++ ChangeLog (revision 21253) @@ -1,3 +1,9 @@ +Thu Jan 1 22:27:55 2009 Yuki Sonoda (Yugui) <yugui@y...> + + * spec/default.mspec: fix for builddir != srcdir + + * Makefile.in: ditto. + Thu Jan 1 21:26:05 2009 Tanaka Akira <akr@f...> * ext/socket/socket.c (sock_s_getnameinfo): use family_to_int. Index: spec/default.mspec =================================================================== --- spec/default.mspec (revision 21252) +++ spec/default.mspec (revision 21253) @@ -1,14 +1,17 @@ load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec' class MSpecScript - builddir = File.expand_path(File.join(File.dirname(__FILE__), '..')) + builddir = Dir.pwd srcdir = ENV['SRCDIR'] - srcdir ||= $1 if File.read("#{builddir}/Makefile")[/^\s*srcdir\s*=\s*(.+)/i] - srcdir ||= builddir + if !srcdir and File.exist?("#{builddir}/Makefile") then + File.open("#{builddir}/Makefile", "r:US-ASCII") {|f| + f.read[/^\s*srcdir\s*=\s*(.+)/i] and srcdir = $1 + } + end config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`} # The default implementation to run the specs. set :target, File.join(builddir, "miniruby#{config['exeext']}") - set :prefix, 'spec/rubyspec' + set :prefix, File.expand_path('rubyspec', File.dirname(__FILE__)) set :flags, %W[ -I#{srcdir}/lib -I#{srcdir}/#{config['EXTOUT']}/common Index: Makefile.in =================================================================== --- Makefile.in (revision 21252) +++ Makefile.in (revision 21253) @@ -268,4 +268,4 @@ test-rubyspec: @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi - $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec $(MSPECOPT) + $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec -B $(srcdir)/spec/default.mspec $(MSPECOPT) Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21252) +++ ruby_1_9_1/ChangeLog (revision 21253) @@ -1,3 +1,9 @@ +Thu Jan 1 22:27:55 2009 Yuki Sonoda (Yugui) <yugui@y...> + + * spec/default.mspec: fix for builddir != srcdir + + * Makefile.in: ditto. + Thu Jan 1 15:08:46 2009 Yuki Sonoda (Yugui) <yugui@y...> * tool/flie2lastrev.rb: supports git repositories which are cloned Index: ruby_1_9_1/spec/default.mspec =================================================================== --- ruby_1_9_1/spec/default.mspec (revision 21252) +++ ruby_1_9_1/spec/default.mspec (revision 21253) @@ -1,14 +1,17 @@ load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec' class MSpecScript - builddir = File.expand_path(File.join(File.dirname(__FILE__), '..')) + builddir = Dir.pwd srcdir = ENV['SRCDIR'] - srcdir ||= $1 if File.read("#{builddir}/Makefile")[/^\s*srcdir\s*=\s*(.+)/i] - srcdir ||= builddir + if !srcdir and File.exist?("#{builddir}/Makefile") then + File.open("#{builddir}/Makefile", "r:US-ASCII") {|f| + f.read[/^\s*srcdir\s*=\s*(.+)/i] and srcdir = $1 + } + end config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`} # The default implementation to run the specs. set :target, File.join(builddir, "miniruby#{config['exeext']}") - set :prefix, 'spec/rubyspec' + set :prefix, File.expand_path('rubyspec', File.dirname(__FILE__)) set :flags, %W[ -I#{srcdir}/lib -I#{srcdir}/#{config['EXTOUT']}/common Index: ruby_1_9_1/Makefile.in =================================================================== --- ruby_1_9_1/Makefile.in (revision 21252) +++ ruby_1_9_1/Makefile.in (revision 21253) @@ -263,4 +263,4 @@ test-rubyspec: @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi - $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec $(MSPECOPT) + $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec -B $(srcdir)/spec/default.mspec $(MSPECOPT) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/