File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -301,7 +301,7 @@ local part_definitions = {
301
301
302
302
test_unit_tck: {
303
303
# Run unittests first before cleaning, they need a full non-cleaned build
304
- run+: jt(["test" , "unit" ]) +
304
+ run+: jt(["test" , "unit" , "--verbose" ]) +
305
305
jt(["test" , "tck" ])
306
306
},
307
307
Original file line number Diff line number Diff line change @@ -1020,13 +1020,14 @@ def test(*args)
1020
1020
when 'bootstraptest' then test_bootstraptest ( *rest )
1021
1021
when 'mri' then test_mri ( *rest )
1022
1022
when 'unit' , 'unittest'
1023
- rest , mx_options = args_split ( rest )
1024
- tests = rest . empty? ? [ 'org.truffleruby' ] : rest
1023
+ unittest_args , mx_options = args_split ( rest )
1024
+ unittest_options , tests = unittest_args . partition { |arg | arg . start_with? ( '-' ) }
1025
+ tests = tests . empty? ? [ 'org.truffleruby' ] : tests
1025
1026
# TODO (eregon, 4 Feb 2019): This should run on GraalVM, not development jars
1026
1027
# The home needs to be set, otherwise TruffleFile does not allow access to files in the TruffleRuby home,
1027
1028
# because it cannot find the correct home.
1028
- home = "-Dorg.graalvm.language.ruby.home=#{ ruby_home } "
1029
- mx ( *mx_options , 'unittest' , home , *tests )
1029
+ unittest_options << "-Dorg.graalvm.language.ruby.home=#{ ruby_home } "
1030
+ mx ( *mx_options , 'unittest' , * unittest_options , *tests )
1030
1031
when 'tck' then mx 'tck' , *rest
1031
1032
else
1032
1033
if File . expand_path ( path , TRUFFLERUBY_DIR ) . start_with? ( "#{ TRUFFLERUBY_DIR } /test" )
You can’t perform that action at this time.
0 commit comments