Skip to content

Commit 2ef23fc

Browse files
committed
Enable assertions and other flags for subprocess in MRI tests
(cherry picked from commit 2fb3fc2)
1 parent e7c05df commit 2ef23fc

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tool/jt.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,14 +1152,15 @@ def test(*args)
11521152

11531153
truffle_args = []
11541154
if truffleruby?
1155-
truffle_args += %w(--reveal --vm.Xmx2G)
1155+
vm_args, ruby_args, _parsed_options = ruby_options({}, %w[--vm.Xmx2G --reveal --experimental-options --testing-rubygems])
1156+
truffle_args = vm_args + ruby_args
11561157
end
11571158

11581159
env_vars = {
11591160
'EXCLUDES' => 'test/mri/excludes',
11601161
'RUBYGEMS_TEST_PATH' => "#{MRI_TEST_PREFIX}/rubygems",
11611162
'RUBYOPT' => [*ENV['RUBYOPT'], '--disable-gems'].join(' '),
1162-
'TRUFFLERUBYOPT' => [*ENV['TRUFFLERUBYOPT'], '--experimental-options', '--testing-rubygems'].join(' '),
1163+
'TRUFFLERUBYOPT' => [*ENV['TRUFFLERUBYOPT'], *truffle_args].join(' '),
11631164
}
11641165
compile_env = {
11651166
# MRI C-ext tests expect to be built with $extmk = true.
@@ -1203,7 +1204,7 @@ def test(*args)
12031204

12041205
command = %w[test/mri/tests/runner.rb -v --color=never --tty=no -q]
12051206
command.unshift("-I#{TRUFFLERUBY_DIR}/.ext") if !cext_tests.empty?
1206-
run_ruby(env_vars, *truffle_args, *extra_args, *command, *test_files, *runner_args, run_options)
1207+
run_ruby(env_vars, *extra_args, *command, *test_files, *runner_args, run_options)
12071208
end
12081209

12091210
def retag(*args)

0 commit comments

Comments
 (0)