From fd113da3aab05c90d14b450b0b20e7c42c00ff6e Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Thu, 19 Nov 2020 11:37:00 +0900 Subject: Allow `bintest` even if build name is not `host` --- mrbgems/mruby-bin-debugger/bintest/mrdb.rb | 4 ++-- mrbgems/mruby-bin-debugger/bintest/print.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mrbgems/mruby-bin-debugger') diff --git a/mrbgems/mruby-bin-debugger/bintest/mrdb.rb b/mrbgems/mruby-bin-debugger/bintest/mrdb.rb index 50460669d..bc5dc4552 100644 --- a/mrbgems/mruby-bin-debugger/bintest/mrdb.rb +++ b/mrbgems/mruby-bin-debugger/bintest/mrdb.rb @@ -13,14 +13,14 @@ class BinTest_MrubyBinDebugger script.flush # compile - `./bin/mrbc -g -o "#{bin.path}" "#{script.path}"` + `#{cmd("mrbc")} -g -o "#{bin.path}" "#{script.path}"` # add mrdb quit testcase << {:cmd=>"quit"} stdin_data = testcase.map{|t| t[:cmd]}.join("\n") << "\n" - ["bin/mrdb #{script.path}","bin/mrdb -b #{bin.path}"].each do |cmd| + ["#{cmd('mrdb')} #{script.path}", "#{cmd('mrdb')} -b #{bin.path}"].each do |cmd| o, s = Open3.capture2(cmd, :stdin_data => stdin_data) exp_vals = testcase.map{|t| t.fetch(:exp, nil)} diff --git a/mrbgems/mruby-bin-debugger/bintest/print.rb b/mrbgems/mruby-bin-debugger/bintest/print.rb index 653be0ce6..74f17d8de 100644 --- a/mrbgems/mruby-bin-debugger/bintest/print.rb +++ b/mrbgems/mruby-bin-debugger/bintest/print.rb @@ -13,7 +13,7 @@ class BinTest_MrubyBinDebugger script.flush # compile - `./bin/mrbc -g -o "#{bin.path}" "#{script.path}"` + `#{cmd("mrbc")} -g -o "#{bin.path}" "#{script.path}"` # add mrdb quit testcase << {:cmd=>"quit"} @@ -21,7 +21,7 @@ class BinTest_MrubyBinDebugger stdin_data = testcase.map{|t| t[:cmd]}.join("\n") << "\n" prompt = /^\(#{Regexp.escape(script.path)}:\d+\) / - ["bin/mrdb #{script.path}","bin/mrdb -b #{bin.path}"].each do |cmd| + ["#{cmd('mrdb')} #{script.path}", "#{cmd('mrdb')} -b #{bin.path}"].each do |cmd| o, s = Open3.capture2(cmd, :stdin_data => stdin_data) scanner = StringScanner.new(o) scanner.skip_until(prompt) -- cgit v1.2.3