jt test commands for basictest and bootstraptest

Author: chrisseaton

ci.jsonnet

@@ -406,7 +406,7 @@ local part_definitions = {
       ] + jt(["lint"]) + self.after_build,
     },
 
-    test_basictest: { run+: jt(["ruby", "test/basictest/runner.rb"]) },
+    test_basictest: { run+: jt(["test", "basictest"]) },
     test_mri: { run+: jt(["test", "mri", "--no-sulong", "--", "-j4"]) },
     test_integration: { run+: jt(["test", "integration"]) },
     test_gems: { run+: jt(["test", "gems"]) },

doc/contributor/testing.md

@@ -71,15 +71,15 @@ Run MRI tests with `jt test mri`.
 MRI's basictest is a smaller set of tests for some basic control structures
 and language features. It is in `test/basictest`.
 
-Run basictest with `jt ruby test/basictest/runner.rb`.
+Run basictest with `jt test basictest`.
 
 ### MRI bootstraptest
 
 MRI's bootstraptest is a smaller set of tests for functionality they require
 to bootstrap their implementation, including some tests against regressions
 and corner cases. It is in `test/bootstraptest`.
 
-Run bootstraptest with `jt ruby test/bootstraptest/runner.rb`. It's not
+Run bootstraptest with `jt test bootstraptest`. It's not
 tractable to run bootstraptest with the JVM, as it starts a new Ruby process
 for each test. Run it with a native build instead.
 

tool/jt.rb

@@ -547,6 +547,8 @@ def help
       jt puts 14 + 2                                 evaluate and print an expression
       jt cextc directory clang-args                  compile the C extension in directory, with optional extra clang arguments
       jt test                                        run all mri tests, specs and integration tests
+      jt test basictest                              run MRI's basictest suite
+      jt test bootstraptest                          run MRI's bootstraptest suite
       jt test mri                                    run mri tests
 #{MRI_TEST_MODULES.map { |k, h| format ' '*10+'%-16s%s', k, h[:help] }.join("\n")}
           --native        use native TruffleRuby image (set AOT_BIN)
@@ -879,6 +881,8 @@ def test(*args)
     when 'gems' then test_gems(*rest)
     when 'ecosystem' then test_ecosystem(*rest)
     when 'specs' then test_specs('run', *rest)
+    when 'basictest' then test_basictest(*rest)
+    when 'bootstraptest' then test_bootstraptest(*rest)
     when 'mri' then test_mri(*rest)
     else
       if File.expand_path(path, TRUFFLERUBY_DIR).start_with?("#{TRUFFLERUBY_DIR}/test")
@@ -894,6 +898,27 @@ def jt(*args)
   end
   private :jt
 
+  def test_basictest(*args)
+    run_runner_test 'basictest/runner.rb', *args
+  end
+  private :test_basictest
+
+  def test_bootstraptest(*args)
+    run_runner_test 'bootstraptest/runner.rb', *args
+  end
+  private :test_bootstraptest
+
+  def run_runner_test(runner, *args)
+    double_dash_index = args.index '--'
+    if double_dash_index
+      args, runner_args = args[0...double_dash_index], args[(double_dash_index+1)..-1]
+    else
+      runner_args = []
+    end
+    run_ruby *args, "#{TRUFFLERUBY_DIR}/test/#{runner}", *runner_args
+  end
+  private :run_runner_test
+
   def test_mri(*args)
     double_dash_index = args.index '--'
     if double_dash_index