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

* lib/mkmf.rb: $extmk should be true for test/runner.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-10-23 05:40:11 +00:00
parent 874ab2e639
commit c2fdd98eb0
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sat Oct 23 14:39:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: $extmk should be true for test/runner.
Sat Oct 23 10:55:37 2010 Koichi Sasada <ko1@atdot.net> Sat Oct 23 10:55:37 2010 Koichi Sasada <ko1@atdot.net>
* vm_dump.c (rb_vm_bugreport): fix to add bug outputs. * vm_dump.c (rb_vm_bugreport): fix to add bug outputs.

2
lib/mkmf.rb
View File

@ -156,7 +156,7 @@ end
topdir = File.dirname(File.dirname(__FILE__)) topdir = File.dirname(File.dirname(__FILE__))
path = File.expand_path($0) path = File.expand_path($0)
$extmk = path[0, topdir.size+1] == topdir+"/" $extmk = path[0, topdir.size+1] == topdir+"/"
$extmk &&= %r"\A(?:ext|enc|tool|test(?:/.+))\z" =~ File.dirname(path[topdir.size+1..-1]) $extmk &&= %r"\A(?:ext|enc|tool|test(?:/.+)?)\z" =~ File.dirname(path[topdir.size+1..-1])
$extmk &&= true $extmk &&= true
if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h") if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
$topdir = $hdrdir $topdir = $hdrdir

2
test/mkmf/test_sizeof.rb
View File

@ -6,7 +6,7 @@ class TestMkmf
open("confdefs.h", "w") {|f| open("confdefs.h", "w") {|f|
f.puts "typedef struct {char x;} test1_t;" f.puts "typedef struct {char x;} test1_t;"
} }
assert_equal(1, mkmf {size = check_sizeof("test1_t", "confdefs.h")}) assert_equal(1, mkmf {check_sizeof("test1_t", "confdefs.h")})
end end
end end
end end