Merge pull request #5563 from suetanvil-misc/project-bintest-emulator-4-flat

Added testing support for cross-MinGW builds.

2 files changed, 4 insertions, 4 deletions

diff --git a/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb b/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb
index f4d9208b3..90bbd123f 100644
--- a/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb
+++ b/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb
@@ -7,7 +7,7 @@ assert('Compiling multiple files without new line in last line. #2361') do
   b.write('module B; end')
   b.flush
   result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} #{b.path} 2>&1`
-  assert_equal "#{cmd('mrbc')}:#{a.path}:Syntax OK", result.chomp
+  assert_equal "#{cmd_bin('mrbc')}:#{a.path}:Syntax OK", result.chomp
   assert_equal 0, $?.exitstatus
 end
 
@@ -16,7 +16,7 @@ assert('parsing function with void argument') do
   a.write('f ()')
   a.flush
   result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} 2>&1`
-  assert_equal "#{cmd('mrbc')}:#{a.path}:Syntax OK", result.chomp
+  assert_equal "#{cmd_bin('mrbc')}:#{a.path}:Syntax OK", result.chomp
   assert_equal 0, $?.exitstatus
 end
 
diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
index bc25f18c1..a626a13cd 100644
--- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb
+++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
@@ -2,7 +2,7 @@ require 'tempfile'
 require 'open3'
 
 def assert_mruby(exp_out, exp_err, exp_success, args)
-  out, err, stat = Open3.capture3(cmd("mruby"), *args)
+  out, err, stat = Open3.capture3( *(cmd_list("mruby") + args))
   assert "assert_mruby" do
     assert_operator(exp_out, :===, out, "standard output")
     assert_operator(exp_err, :===, err, "standard error")
@@ -87,7 +87,7 @@ assert('mruby -e option (no code specified)') do
 end
 
 assert('mruby -h option') do
-  assert_mruby(/\AUsage: #{Regexp.escape cmd("mruby")} .*/m, "", true, %w[-h])
+  assert_mruby(/\AUsage: #{Regexp.escape cmd_bin("mruby")} .*/m, "", true, %w[-h])
 end
 
 assert('mruby -r option') do