Skip to content

Commit 369050e

Browse files
committed
[GR-14058] Fix downstream tests and fix mx build_truffleruby.
PullRequest: truffleruby/635
2 parents b19391e + 4a84859 commit 369050e

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

mx.truffleruby/mx_truffleruby.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,8 @@ def jt(*args):
5757
mx.run(['ruby', join(root, 'tool/jt.rb')] + list(args))
5858

5959
def build_truffleruby(args = []):
60-
# Only build the necessary distributions to avoid building Sulong tests
61-
truffleruby_dists = [
62-
'TRUFFLERUBY',
63-
'TRUFFLERUBY-LAUNCHER',
64-
'TRUFFLERUBY_GRAALVM_SUPPORT',
65-
'TRUFFLERUBY-TEST',
66-
]
6760
mx.command_function('sversions')([])
68-
mx.command_function('build')([
69-
'--force-javac', '--warning-as-error', '--force-deprecation-as-warning',
70-
'-A-Xmaxerrs', '-A1000', # show more than default 100 errors not to hide actual errors under many missing symbols
71-
'--dependencies', ','.join(truffleruby_dists)])
61+
jt("build")
7262

7363
def ruby_deploy_binaries(args):
7464
"""Deploy a binary suite for truffleruby"""
@@ -103,8 +93,7 @@ def ruby_run_specs(args):
10393
def ruby_testdownstream_hello(args):
10494
"""Run a minimal Hello World test"""
10595
build_truffleruby()
106-
with VerboseMx():
107-
mx.run(['bin/truffleruby', '-e', 'puts "Hello Ruby!"'], cwd=root)
96+
jt('ruby', '-e', 'puts "Hello Ruby!"')
10897

10998
def ruby_testdownstream_aot(args):
11099
"""Run tests for the native image"""

0 commit comments

Comments
 (0)