ruby-changes:17553
From: nobu <ko1@a...>
Date: Sat, 23 Oct 2010 14:52:12 +0900 (JST)
Subject: [ruby-changes:17553] Ruby:r29558 (trunk): * lib/mkmf.rb: $extmk should be true for test/runner.
nobu 2010-10-23 14:40:11 +0900 (Sat, 23 Oct 2010) New Revision: 29558 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29558 Log: * lib/mkmf.rb: $extmk should be true for test/runner. Modified files: trunk/ChangeLog trunk/lib/mkmf.rb trunk/test/mkmf/test_sizeof.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 29557) +++ ChangeLog (revision 29558) @@ -1,3 +1,7 @@ +Sat Oct 23 14:39:58 2010 Nobuyoshi Nakada <nobu@r...> + + * lib/mkmf.rb: $extmk should be true for test/runner. + Sat Oct 23 10:55:37 2010 Koichi Sasada <ko1@a...> * vm_dump.c (rb_vm_bugreport): fix to add bug outputs. Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 29557) +++ lib/mkmf.rb (revision 29558) @@ -156,7 +156,7 @@ topdir = File.dirname(File.dirname(__FILE__)) path = File.expand_path($0) $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 if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h") $topdir = $hdrdir Index: test/mkmf/test_sizeof.rb =================================================================== --- test/mkmf/test_sizeof.rb (revision 29557) +++ test/mkmf/test_sizeof.rb (revision 29558) @@ -6,7 +6,7 @@ open("confdefs.h", "w") {|f| 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/