1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* configure.in, win32/Makefile.sub (EXECUTABLE_EXTS): should be

space-separated.  [ruby-core:27912]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-01-29 05:21:55 +00:00
parent e8e41b217c
commit 9433d94cff
3 changed files with 40 additions and 0 deletions

View file

@ -2092,6 +2092,7 @@ AC_SUBST(ARCHFILE)
if test "$EXEEXT" = .exe; then
EXECUTABLE_EXTS='".exe",".com",".cmd",".bat"'
AC_DEFINE_UNQUOTED(EXECUTABLE_EXTS, $EXECUTABLE_EXTS)
EXECUTABLE_EXTS=`echo $EXECUTABLE_EXTS | tr -d '"' | tr , ' '`
AC_SUBST(EXECUTABLE_EXTS)
fi

View file

@ -0,0 +1,36 @@
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.each do |ext|
full = name+ext
begin
open(full, "w") {|f| f.chmod(0755)}
result = f.do_find_executable(name)
ensure
File.unlink(full)
end
assert_equal("#{@tmpdir}/#{name}#{ext}", result, bug2669)
end
ensure
ENV["PATH"] = path
end
end
end

View file

@ -593,6 +593,9 @@ $(BANG)endif
# @ren $(RUBY_CONFIG_H:.h=_h).bak $(RUBY_CONFIG_H)
#!endif
EXECUTABLE_EXTS = $(EXECUTABLE_EXTS:"=) # "
EXECUTABLE_EXTS = $(EXECUTABLE_EXTS:,= )
config.status: $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk
@echo Creating $@
@exit <<$@