1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* spec/default.mspec: fix for builddir != srcdir

Browse Source 
* Makefile.in: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-01-01 13:30:25 +00:00
parent e924cabede
commit 8d8d36c15c
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Jan 1 22:27:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* spec/default.mspec: fix for builddir != srcdir
* Makefile.in: ditto.
Thu Jan 1 21:26:05 2009 Tanaka Akira <akr@fsij.org> Thu Jan 1 21:26:05 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (sock_s_getnameinfo): use family_to_int. * ext/socket/socket.c (sock_s_getnameinfo): use family_to_int.

2
Makefile.in
View File

@ -268,4 +268,4 @@ update-rubyspec:
test-rubyspec: test-rubyspec:
@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi @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)

11
spec/default.mspec
View File

@ -1,14 +1,17 @@
load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec' load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec'
class MSpecScript class MSpecScript
builddir = File.expand_path(File.join(File.dirname(__FILE__), '..')) builddir = Dir.pwd
srcdir = ENV['SRCDIR'] srcdir = ENV['SRCDIR']
srcdir ||= $1 if File.read("#{builddir}/Makefile")[/^\s*srcdir\s*=\s*(.+)/i] if !srcdir and File.exist?("#{builddir}/Makefile") then
srcdir ||= builddir 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}"]'`} config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`}
# The default implementation to run the specs. # The default implementation to run the specs.
set :target, File.join(builddir, "miniruby#{config['exeext']}") set :target, File.join(builddir, "miniruby#{config['exeext']}")
set :prefix, 'spec/rubyspec' set :prefix, File.expand_path('rubyspec', File.dirname(__FILE__))
set :flags, %W[ set :flags, %W[
-I#{srcdir}/lib -I#{srcdir}/lib
-I#{srcdir}/#{config['EXTOUT']}/common -I#{srcdir}/#{config['EXTOUT']}/common