Skip to content

Commit 5976f4e

Browse files
committed
[GR-15527] Remove ruby_testdownstream_sulong, it is now a proper GraalVM gate
PullRequest: truffleruby/3293
2 parents 713d643 + 65f2527 commit 5976f4e

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

ci.jsonnet

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,9 +346,10 @@ local part_definitions = {
346346

347347
test_cexts: {
348348
is_after+:: ["$.use.common"],
349-
run+: [
350-
["mx", "--dynamicimports", "/sulong", "ruby_testdownstream_sulong"],
351-
] + jt(["test", "bundle"]),
349+
# Only what is not already tested in other gates (e.g., C API and C ext specs are part of test_specs)
350+
run+: jt(["test", "mri", "--all-sulong"]) +
351+
jt(["test", "cexts"]) +
352+
jt(["test", "bundle"]),
352353
},
353354

354355
testdownstream_aot: { run+: [["mx", "ruby_testdownstream_aot", "$RUBY_BIN"]] },

mx.truffleruby/mx_truffleruby.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,6 @@ def ruby_testdownstream_aot(args):
197197
# Run "jt test fast --native :truffle" to catch slow specs in Truffle which only apply to native
198198
ruby_run_specs(aot_bin, fast + [':truffle'])
199199

200-
def ruby_testdownstream_sulong(args):
201-
"""Run C extension tests"""
202-
build_truffleruby([])
203-
# Ensure Sulong is available
204-
mx.suite('sulong')
205-
206-
# Only what is not already tested in the GraalVM gates
207-
jt('test', 'mri', '--all-sulong')
208-
jt('test', 'cexts')
209-
210200
def ruby_spotbugs(args):
211201
"""Run SpotBugs with custom options to detect more issues"""
212202
mx.command_function('build')(['--no-native']) # SpotBugs needs all Java projects to be built
@@ -312,7 +302,6 @@ def verify_ci(args):
312302
'ruby_check_heap_dump': [ruby_check_heap_dump, ''],
313303
'ruby_testdownstream_aot': [ruby_testdownstream_aot, 'aot_bin'],
314304
'ruby_testdownstream_hello': [ruby_testdownstream_hello, ''],
315-
'ruby_testdownstream_sulong': [ruby_testdownstream_sulong, ''],
316305
'ruby_spotbugs': [ruby_spotbugs, ''],
317306
'verify-ci': [verify_ci, '[options]'],
318307
'ruby_jacoco_args': [ruby_jacoco_args, ''],

0 commit comments

Comments
 (0)