diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-06 14:17:40 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-06 14:17:40 +0000 |
commit | 6852bf0933055bc7193259e934935d051481469f (patch) | |
tree | 52dee1302fdaa324ab954a8294173da78e7ff52e | |
parent | a3732110fbfe79be3b17fe697186f0d8a7c823cc (diff) | |
download | ruby-6852bf0933055bc7193259e934935d051481469f.tar.gz |
* test/mkmf/test_find_executable.rb (test_find_executable): use
configured results.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/mkmf/test_find_executable.rb | 16 |
2 files changed, 7 insertions, 14 deletions
@@ -1,4 +1,7 @@ -Mon Dec 6 22:55:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Dec 6 23:17:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/mkmf/test_find_executable.rb (test_find_executable): use + configured results. * common.mk (test-build): test for build process. diff --git a/test/mkmf/test_find_executable.rb b/test/mkmf/test_find_executable.rb index 87e1d03c51..5dca186a41 100644 --- a/test/mkmf/test_find_executable.rb +++ b/test/mkmf/test_find_executable.rb @@ -2,28 +2,18 @@ require_relative 'base' class TestMkmf class TestFindExecutable < TestMkmf - class F - def do_find_executable(name) - find_executable(name) - end - end - def test_find_executable bug2669 = '[ruby-core:27912]' path, ENV["PATH"] = ENV["PATH"], path ENV["PATH"] = @tmpdir - f = F.new name = "foobar#{$$}#{rand(1000)}" - if /mswin\d|mingw|cygwin/ =~ RUBY_PLATFORM - exts = %w[.exe .com .cmd .bat] - else - exts = [""] - end + exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split + exts[0] ||= "" exts.each do |ext| full = name+ext begin open(full, "w") {|ff| ff.chmod(0755)} - result = f.do_find_executable(name) + result = mkmf {find_executable(name)} ensure File.unlink(full) end |