Skip to content

Commit 17febdf

Browse files
committed
Set the ruby home with javaProperties for TRUFFLERUBY-TEST and TRUFFLERUBY-TCK
* It also seems to work to set javaProperties on the TRUFFLERUBY distribution but that is some kind of cyclic dependency that is probably best to avoid.
1 parent 6024a6c commit 17febdf

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

mx.truffleruby/suite.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,14 +513,21 @@
513513
"distDependencies": [
514514
"TRUFFLERUBY",
515515
"TRUFFLERUBY-SERVICES",
516+
"TRUFFLERUBY_GRAALVM_SUPPORT",
516517
],
518+
"javaProperties": {
519+
"org.graalvm.language.ruby.home": "<path:TRUFFLERUBY_GRAALVM_SUPPORT>"
520+
},
517521
"license": ["EPL-2.0"],
518522
},
519523

520524
"TRUFFLERUBY-TCK": {
521525
"testDistribution": True,
522526
"dependencies": ["org.truffleruby.tck"],
523527
"distDependencies": ["truffle:TRUFFLE_TCK"],
528+
"javaProperties": {
529+
"org.graalvm.language.ruby.home": "<path:TRUFFLERUBY_GRAALVM_SUPPORT>"
530+
},
524531
"license": ["EPL-2.0"],
525532
},
526533
},

tool/jt.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,9 +1024,6 @@ def test(*args)
10241024
unittest_options, tests = unittest_args.partition { |arg| arg.start_with?('-') }
10251025
tests = tests.empty? ? ['org.truffleruby'] : tests
10261026
# TODO (eregon, 4 Feb 2019): This should run on GraalVM, not development jars
1027-
# The home needs to be set, otherwise TruffleFile does not allow access to files in the TruffleRuby home,
1028-
# because it cannot find the correct home.
1029-
unittest_options << "-Dorg.graalvm.language.ruby.home=#{ruby_home}"
10301027
mx(*mx_options, 'unittest', *unittest_options, *tests)
10311028
when 'tck' then mx 'tck', *rest
10321029
else

0 commit comments

Comments
 (0)