Skip to content

Commit 8d8ebd7

Browse files
committed
[GR-16515] JT: Remove 'jt build cexts', use 'jt build' instead.
PullRequest: truffleruby/900
2 parents 084029b + f6145dd commit 8d8ebd7

File tree

1 file changed

+1
-29
lines changed

1 file changed

+1
-29
lines changed

tool/jt.rb

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ def help
449449
--no-sforceimports do not run sforceimports before building
450450
parser build the parser
451451
options build the options
452-
cexts build only the C extensions (part of "jt build")
453452
graalvm build a minimal JVM-only GraalVM containing only TruffleRuby,
454453
available by default in mxbuild/truffleruby-jvm,
455454
the Ruby is symlinked into rbenv or chruby if available
@@ -495,16 +494,12 @@ def help
495494
jt test spec/ruby/language run specs in this directory
496495
jt test spec/ruby/language/while_spec.rb run specs in this file
497496
jt test compiler run compiler tests
498-
jt test integration runs all integration tests
499-
jt test integration [TESTS] runs the given integration tests
497+
jt test integration [TESTS] run integration tests
500498
jt test bundle [--jdebug] tests using bundler
501499
jt test gems [TESTS] tests using gems
502500
jt test ecosystem [TESTS] tests using the wider ecosystem such as bundler, Rails, etc
503501
jt test cexts [--no-openssl] [--no-gems] [test_names...]
504502
run C extension tests (set GEM_HOME)
505-
jt test report :language build a report on language specs
506-
:core (results go into test/target/mspec-html-report)
507-
:library
508503
jt test unit run Java unittests
509504
jt test tck run tck tests
510505
jt gem-test-pack check that the gem test pack is downloaded, or download it for you, and print the path
@@ -562,8 +557,6 @@ def build(*options)
562557
File.write(yytables, File.read(yytables).gsub('package org.jruby.parser;', 'package org.truffleruby.parser.parser;'))
563558
when 'options'
564559
sh 'tool/generate-options.rb'
565-
when "cexts" # Included in 'mx build' but useful to recompile just that part
566-
mx 'build', '--dependencies', 'org.truffleruby.cext'
567560
when 'graalvm'
568561
build_graalvm(*options)
569562
when 'native'
@@ -744,9 +737,6 @@ def compile_cext(name, ext_dir, target, clang_opts, env: {})
744737
extconf = "#{ext_dir}/extconf.rb"
745738
raise "#{extconf} does not exist" unless File.exist?(extconf)
746739

747-
# Make sure ruby.su is built
748-
build("cexts")
749-
750740
chdir(ext_dir) do
751741
run_ruby(env, '-rmkmf', "#{ext_dir}/extconf.rb") # -rmkmf is required for C ext tests
752742
if File.exists?('Makefile')
@@ -1126,12 +1116,6 @@ def test_cexts(*args)
11261116
end
11271117
private :test_cexts
11281118

1129-
def test_report(component)
1130-
test 'specs', '--truffle-formatter', component
1131-
sh 'ant', '-f', 'spec/buildTestReports.xml'
1132-
end
1133-
private :test_report
1134-
11351119
def test_integration(*args)
11361120
tests_path = "#{TRUFFLERUBY_DIR}/test/truffle/integration"
11371121
single_test = !args.empty?
@@ -1250,7 +1234,6 @@ def mspec(*args)
12501234
def test_specs(command, *args)
12511235
env_vars = {}
12521236
options = []
1253-
running_local_build = false
12541237

12551238
case command
12561239
when 'run'
@@ -1286,7 +1269,6 @@ def test_specs(command, *args)
12861269
options << '-t' << find_launcher(true)
12871270
options << '-T--native'
12881271
else
1289-
running_local_build = true
12901272
options += %w[-T--vm.ea -T--vm.esa -T--vm.Xmx2G]
12911273
options << "-T--core-load-path=#{TRUFFLERUBY_DIR}/src/main/ruby/truffleruby"
12921274
options << "-T--polyglot" # For Truffle::Interop.export specs
@@ -1307,20 +1289,10 @@ def test_specs(command, *args)
13071289
options << "-T--experimental-options" << "-T--exceptions-print-uncaught-java"
13081290
end
13091291

1310-
if args.delete('--truffle-formatter')
1311-
options += %w[--format spec/truffle_formatter.rb]
1312-
end
1313-
13141292
if ci?
13151293
options += %w[--format specdoc]
13161294
end
13171295

1318-
if running_local_build && (
1319-
args.any? { |arg| arg.include? 'optional/capi' } ||
1320-
!(args & %w[:capi :truffle_capi :library_cext]).empty?)
1321-
build("cexts")
1322-
end
1323-
13241296
run_mspec env_vars, command, *options, *args
13251297
end
13261298
private :test_specs

0 commit comments

Comments
 (0)