Skip to content

Commit da149b5

Browse files
committed
test: use RbConfig.ruby for system calls
1 parent 4f31f39 commit da149b5

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

test/benchmarks/run_benchmarks.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
require 'fileutils'
66
require 'benchmark'
77
require 'optparse'
8+
require 'rbconfig'
89

910
PROGRAMS_DIR = File.expand_path('programs', __dir__)
1011
FIXTURES_DIR = File.expand_path('fixtures', __dir__)
@@ -44,15 +45,15 @@ def run_benchmark(name)
4445
results = { name: name }
4546

4647
elapsed = Benchmark.realtime do
47-
system('ruby', program)
48+
system(RbConfig.ruby, program)
4849
raise 'Program failed' unless $?.success?
4950
end
5051
results[:ruby_ms] = (elapsed * 1000).round
5152

5253
native_dir = File.join(TMP_DIR, name, 'native')
5354
FileUtils.mkdir_p(native_dir)
5455
elapsed = Benchmark.realtime do
55-
system('ruby', File.expand_path('../../gems/codetracer-ruby-recorder/lib/native_trace.rb', __dir__),
56+
system(RbConfig.ruby, File.expand_path('../../gems/codetracer-ruby-recorder/lib/native_trace.rb', __dir__),
5657
'--out-dir', native_dir, program)
5758
raise 'Native trace failed' unless $?.success?
5859
end
@@ -63,7 +64,7 @@ def run_benchmark(name)
6364
pure_dir = File.join(TMP_DIR, name, 'pure')
6465
FileUtils.mkdir_p(pure_dir)
6566
elapsed = Benchmark.realtime do
66-
system('ruby', File.expand_path('../../gems/codetracer-pure-ruby-recorder/lib/trace.rb', __dir__),
67+
system(RbConfig.ruby, File.expand_path('../../gems/codetracer-pure-ruby-recorder/lib/trace.rb', __dir__),
6768
'--out-dir', pure_dir, program)
6869
raise 'Pure trace failed' unless $?.success?
6970
end

test/test_tracer.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
require 'json'
33
require 'fileutils'
44
require 'open3'
5+
require 'rbconfig'
56
require 'tmpdir'
67

78
class TraceTest < Minitest::Test
@@ -22,7 +23,7 @@ def run_trace(tracer_script, program_name, *args)
2223
program = File.join('test', 'programs', program_name)
2324
out_dir = File.join('test', 'tmp', base, tracer_name)
2425
FileUtils.mkdir_p(out_dir)
25-
stdout, stderr, status = Open3.capture3('ruby', tracer_script, '--out-dir', out_dir, program, *args)
26+
stdout, stderr, status = Open3.capture3(RbConfig.ruby, tracer_script, '--out-dir', out_dir, program, *args)
2627
raise "trace failed: #{stderr}" unless status.success?
2728
trace_file = File.join(out_dir, 'trace.json')
2829
trace = JSON.parse(File.read(trace_file)) if File.exist?(trace_file)
@@ -84,7 +85,7 @@ def run_gem_installation_test(gem_bin, gem_module)
8485

8586
out_dir = File.join('test', 'tmp', "gem_install_#{gem_bin.tr('-', '_')}")
8687
FileUtils.rm_rf(out_dir)
87-
stdout, stderr, status = Open3.capture3(env, 'ruby', '-S', gem_bin, '--out-dir', out_dir, File.join('test', 'programs', 'addition.rb'))
88+
stdout, stderr, status = Open3.capture3(env, RbConfig.ruby, '-S', gem_bin, '--out-dir', out_dir, File.join('test', 'programs', 'addition.rb'))
8889
raise "#{gem_bin} failed: #{stderr}" unless status.success?
8990
assert_equal "3\n", stdout
9091
assert File.exist?(File.join(out_dir, 'trace.json'))
@@ -105,7 +106,7 @@ def run_gem_installation_test(gem_bin, gem_module)
105106
RUBY
106107
script_path = File.join('test', 'tmp', "use_#{gem_bin.tr('-', '_')}.rb")
107108
File.write(script_path, script)
108-
stdout, stderr, status = Open3.capture3(env, 'ruby', script_path)
109+
stdout, stderr, status = Open3.capture3(env, RbConfig.ruby, script_path)
109110
raise "#{gem_module} library failed: #{stderr}" unless status.success?
110111
expected_out = <<~OUT
111112
start trace
@@ -132,7 +133,7 @@ def test_pure_debug_smoke
132133
env = { 'CODETRACER_RUBY_RECORDER_DEBUG' => '1' }
133134
out_dir = File.join('test', 'tmp', 'debug_smoke')
134135
FileUtils.rm_rf(out_dir)
135-
stdout, stderr, status = Open3.capture3(env, 'ruby', 'gems/codetracer-pure-ruby-recorder/lib/trace.rb', '--out-dir', out_dir, File.join('test', 'programs', 'addition.rb'))
136+
stdout, stderr, status = Open3.capture3(env, RbConfig.ruby, 'gems/codetracer-pure-ruby-recorder/lib/trace.rb', '--out-dir', out_dir, File.join('test', 'programs', 'addition.rb'))
136137
raise "trace failed: #{stderr}" unless status.success?
137138

138139
lines = stdout.lines.map(&:chomp)

0 commit comments

Comments
 (0)