Skip to content

Commit 57e7eea

Browse files
committed
Use exec() in jt for MRI tests and benchmarks
PullRequest: truffleruby/511
2 parents 07ebf50 + 155cca2 commit 57e7eea

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

tool/jt.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -468,14 +468,14 @@ def help
468468
options build the options
469469
cexts build only the C extensions (part of "jt build")
470470
native [--no-sulong] [--no-jvmci] [--no-sforceimports] [--no-tools] [extra mx image options]
471-
build a native image of TruffleRuby (--no-jvmci to use the system Java)
471+
build a native image of TruffleRuby (--no-jvmci to use the system Java)
472472
(--no-tools to exclude chromeinspector and profiler)
473473
jt build_stats [--json] <attribute> prints attribute's value from build process (e.g., binary size)
474474
jt clean clean
475475
jt env prints the current environment
476476
jt rebuild clean, sforceimports, and build
477477
jt dis <file> finds the bc file in the project, disassembles, and returns new filename
478-
jt ruby [jt options] [--] [ruby options] args...
478+
jt ruby [jt options] [--] [ruby options] args...
479479
run TruffleRuby with args
480480
--graal use Graal (set either GRAALVM_BIN, JVMCI_BIN or GRAAL_HOME, or have graal built as a sibling)
481481
--stress stress the compiler (compile immediately, foreground compilation, compilation exceptions are fatal)
@@ -489,7 +489,7 @@ def help
489489
--jdebug run a JDWP debug server on #{JDEBUG_PORT}
490490
--jexception[s] print java exceptions
491491
--exec use exec rather than system
492-
--no-print-cmd don\'t print the command
492+
--no-print-cmd don\'t print the command
493493
jt gem shortcut for `jt ruby -S gem`, to install Ruby gems, etc
494494
jt e 14 + 2 evaluate an expression
495495
jt puts 14 + 2 evaluate and print an expression
@@ -974,11 +974,11 @@ def test_mri(*args)
974974
end
975975
end.sort - excluded_files
976976

977-
run_mri_tests(mri_args, files_to_run, runner_args)
977+
run_mri_tests(mri_args, files_to_run, runner_args, use_exec: true)
978978
end
979979
private :test_mri
980980

981-
def run_mri_tests(extra_args, test_files, runner_args, run_options = {})
981+
def run_mri_tests(extra_args, test_files, runner_args, run_options)
982982
prefix = "test/mri/tests/"
983983
abs_prefix = "#{TRUFFLERUBY_DIR}/#{prefix}"
984984
test_files = test_files.map { |file|
@@ -1063,7 +1063,7 @@ def retag(*args)
10631063
sh "ruby", "tool/parse_mri_errors.rb", output_file
10641064

10651065
puts "3. Verifying tests pass"
1066-
run_mri_tests(options, test_files, [])
1066+
run_mri_tests(options, test_files, [], use_exec: true)
10671067
end
10681068

10691069
def test_compiler(*args)
@@ -1764,9 +1764,9 @@ def benchmark(*args)
17641764
run_args.push *args
17651765

17661766
if benchmark_ruby
1767-
sh benchmark_ruby, *run_args
1767+
sh benchmark_ruby, *run_args, use_exec: true
17681768
else
1769-
run_ruby *run_args
1769+
run_ruby *run_args, use_exec: true
17701770
end
17711771
end
17721772

0 commit comments

Comments
 (0)