Skip to content

Commit 46fddd0

Browse files
committed
Run unit tests on module path
* Adapt TruffleRubyBootstrapLauncher so it handles running on module path.
1 parent 1353407 commit 46fddd0

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

mx.truffleruby/mx_truffleruby.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def contents(self, result):
119119
'--disable-gems',
120120
'--disable-rubyopt',
121121
]
122-
command = [jdk.java] + jvm_args + [main_class] + ruby_options + ['"$@"']
122+
command = [jdk.java] + jvm_args + ['-m', 'org.graalvm.ruby.launcher/' + main_class] + ruby_options + ['"$@"']
123123
return "#!/usr/bin/env bash\n" + "exec " + " ".join(command) + "\n"
124124

125125

mx.truffleruby/suite.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"tag": ["default", "public"],
432432
},
433433
"noMavenJavadoc": True,
434+
"useModulePath": True,
434435
},
435436

436437
# Required to share code between the launcher and the rest,
@@ -458,6 +459,7 @@
458459
"tag": ["default", "public"],
459460
},
460461
"noMavenJavadoc": True,
462+
"useModulePath": True,
461463
},
462464

463465
"TRUFFLERUBY-PROCESSOR": {
@@ -489,6 +491,7 @@
489491
"description": "TruffleRuby services",
490492
"license": ["EPL-2.0"],
491493
"maven": False,
494+
"useModulePath": True,
492495
},
493496

494497
"TRUFFLERUBY": {
@@ -508,6 +511,9 @@
508511
"sulong:SULONG_API",
509512
"sulong:SULONG_NFI",
510513
"sdk:JLINE3",
514+
# runtime-only dependencies
515+
"truffle:TRUFFLE_NFI_LIBFFI",
516+
"sulong:SULONG_NATIVE",
511517
],
512518
"exclude": [ # Keep in sync with org.truffleruby dependencies and truffle_jars in mx_truffleruby.py
513519
"truffleruby:JCODINGS",
@@ -525,6 +531,7 @@
525531
"tag": ["default", "public"],
526532
},
527533
"noMavenJavadoc": True,
534+
"useModulePath": True,
528535
},
529536

530537
"RUBY_COMMUNITY": {
@@ -576,6 +583,7 @@
576583
"description": "TruffleRuby Launcher",
577584
"license": ["EPL-2.0"],
578585
"maven": False,
586+
"useModulePath": True,
579587
},
580588

581589
"TRUFFLERUBY_GRAALVM_SUPPORT": {

0 commit comments

Comments
 (0)