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

Use EXEEXT

Browse Source 
* test/lib/minitest/unit.rb (MiniTest::Assertions.diff): use
  `EXEEXT` configured value instead of switching by hard coded
  `host_os`.
This commit is contained in:
Nobuyoshi Nakada 2019-06-22 23:44:19 +09:00
parent f738eeabc2
commit f5e2904471
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/lib/minitest/unit.rb
View File

@ -79,18 +79,14 @@ module MiniTest
# figure out what diff to use. # figure out what diff to use.
def self.diff def self.diff
@diff = if (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ && unless defined? @diff
system("diff.exe", __FILE__, __FILE__)) then exe = RbConfig::CONFIG['EXEEXT']
"diff.exe -u" @diff = %W"gdiff#{exe} diff#{exe}".find do |diff|
elsif Minitest::Unit::Guard.maglev? then # HACK if system(diff, "-u", __FILE__, __FILE__)
"diff -u" break "#{diff} -u"
elsif system("gdiff", __FILE__, __FILE__) end
"gdiff -u" # solaris and kin suck end
elsif system("diff", __FILE__, __FILE__) end
"diff -u"
else
nil
end unless defined? @diff
@diff @diff
end end