diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-08 07:19:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-08 07:19:38 +0000 |
commit | 2696fb950391fb74685caf0484f130430d2d2146 (patch) | |
tree | 849b750fc75f8476aa779c86bfa5ac389e18cc00 /tool | |
parent | 52c7036436f8cd5255103e37dde0720a997eec63 (diff) | |
download | ruby-2696fb950391fb74685caf0484f130430d2d2146.tar.gz |
test: realpath
* 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
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/runruby.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tool/runruby.rb b/tool/runruby.rb index 76478c66f1..0165634edf 100755 --- a/tool/runruby.rb +++ b/tool/runruby.rb @@ -32,7 +32,16 @@ while arg = ARGV[0] ARGV.shift 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 ||= '.' abs_archdir = File.expand_path(archdir) @@ -50,7 +59,7 @@ end libs = [abs_archdir] extout ||= config["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) end libs << File.expand_path("lib", srcdir) |