Skip to content

Commit aaec046

Browse files
committed
Run unit tests with --verbose in CI
1 parent f0a798e commit aaec046

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ local part_definitions = {
301301

302302
test_unit_tck: {
303303
# Run unittests first before cleaning, they need a full non-cleaned build
304-
run+: jt(["test", "unit"]) +
304+
run+: jt(["test", "unit", "--verbose"]) +
305305
jt(["test", "tck"])
306306
},
307307

tool/jt.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,13 +1020,14 @@ def test(*args)
10201020
when 'bootstraptest' then test_bootstraptest(*rest)
10211021
when 'mri' then test_mri(*rest)
10221022
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
10251026
# TODO (eregon, 4 Feb 2019): This should run on GraalVM, not development jars
10261027
# The home needs to be set, otherwise TruffleFile does not allow access to files in the TruffleRuby home,
10271028
# 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)
10301031
when 'tck' then mx 'tck', *rest
10311032
else
10321033
if File.expand_path(path, TRUFFLERUBY_DIR).start_with?("#{TRUFFLERUBY_DIR}/test")

0 commit comments

Comments
 (0)