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

test: realpath

Browse Source 
* test/runner.rb (src_testdir): expand real path so that
  TestGem#test_self_find_files does not fail by aliased load path when
  srcdir contains a symbolic link.
* tool/runruby.rb (srcdir): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-06-08 07:19:38 +00:00
parent 52c7036436
commit 2696fb9503
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Jun 8 16:19:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/runner.rb (src_testdir): expand real path so that
TestGem#test_self_find_files does not fail by aliased load path when
srcdir contains a symbolic link.
* tool/runruby.rb (srcdir): ditto.
Fri Jun 8 12:04:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jun 8 12:04:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (rb_fork_err): error state in the child process is prior * process.c (rb_fork_err): error state in the child process is prior

2
test/runner.rb
View File

@ -2,7 +2,7 @@ require 'rbconfig'
require 'test/unit' require 'test/unit'
src_testdir = File.dirname(File.expand_path(__FILE__)) src_testdir = File.dirname(File.realpath(__FILE__))
$LOAD_PATH << src_testdir $LOAD_PATH << src_testdir
module Gem module Gem
end end

13
tool/runruby.rb
View File

@ -32,7 +32,16 @@ while arg = ARGV[0]
ARGV.shift ARGV.shift
end end
srcdir ||= File.expand_path('..', File.dirname(__FILE__)) unless defined?(File.realpath)
def File.realpath(*args)
Dir.chdir do
expand_path(*args)
Dir.pwd
end
end
end
srcdir ||= File.realpath('..', File.dirname(__FILE__))
archdir ||= '.' archdir ||= '.'
abs_archdir = File.expand_path(archdir) abs_archdir = File.expand_path(archdir)
@ -50,7 +59,7 @@ end
libs = [abs_archdir] libs = [abs_archdir]
extout ||= config["EXTOUT"] extout ||= config["EXTOUT"]
if extout if extout
abs_extout = File.expand_path(extout) abs_extout = File.expand_path(extout, abs_archdir)
libs << File.expand_path("common", abs_extout) << File.expand_path(config['arch'], abs_extout) libs << File.expand_path("common", abs_extout) << File.expand_path(config['arch'], abs_extout)
end end
libs << File.expand_path("lib", srcdir) libs << File.expand_path("lib", srcdir)