@@ -449,7 +449,6 @@ def help
449
449
--no-sforceimports do not run sforceimports before building
450
450
parser build the parser
451
451
options build the options
452
- cexts build only the C extensions (part of "jt build")
453
452
graalvm build a minimal JVM-only GraalVM containing only TruffleRuby,
454
453
available by default in mxbuild/truffleruby-jvm,
455
454
the Ruby is symlinked into rbenv or chruby if available
@@ -495,16 +494,12 @@ def help
495
494
jt test spec/ruby/language run specs in this directory
496
495
jt test spec/ruby/language/while_spec.rb run specs in this file
497
496
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
500
498
jt test bundle [--jdebug] tests using bundler
501
499
jt test gems [TESTS] tests using gems
502
500
jt test ecosystem [TESTS] tests using the wider ecosystem such as bundler, Rails, etc
503
501
jt test cexts [--no-openssl] [--no-gems] [test_names...]
504
502
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
508
503
jt test unit run Java unittests
509
504
jt test tck run tck tests
510
505
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)
562
557
File . write ( yytables , File . read ( yytables ) . gsub ( 'package org.jruby.parser;' , 'package org.truffleruby.parser.parser;' ) )
563
558
when 'options'
564
559
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'
567
560
when 'graalvm'
568
561
build_graalvm ( *options )
569
562
when 'native'
@@ -744,9 +737,6 @@ def compile_cext(name, ext_dir, target, clang_opts, env: {})
744
737
extconf = "#{ ext_dir } /extconf.rb"
745
738
raise "#{ extconf } does not exist" unless File . exist? ( extconf )
746
739
747
- # Make sure ruby.su is built
748
- build ( "cexts" )
749
-
750
740
chdir ( ext_dir ) do
751
741
run_ruby ( env , '-rmkmf' , "#{ ext_dir } /extconf.rb" ) # -rmkmf is required for C ext tests
752
742
if File . exists? ( 'Makefile' )
@@ -1126,12 +1116,6 @@ def test_cexts(*args)
1126
1116
end
1127
1117
private :test_cexts
1128
1118
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
-
1135
1119
def test_integration ( *args )
1136
1120
tests_path = "#{ TRUFFLERUBY_DIR } /test/truffle/integration"
1137
1121
single_test = !args . empty?
@@ -1250,7 +1234,6 @@ def mspec(*args)
1250
1234
def test_specs ( command , *args )
1251
1235
env_vars = { }
1252
1236
options = [ ]
1253
- running_local_build = false
1254
1237
1255
1238
case command
1256
1239
when 'run'
@@ -1286,7 +1269,6 @@ def test_specs(command, *args)
1286
1269
options << '-t' << find_launcher ( true )
1287
1270
options << '-T--native'
1288
1271
else
1289
- running_local_build = true
1290
1272
options += %w[ -T--vm.ea -T--vm.esa -T--vm.Xmx2G ]
1291
1273
options << "-T--core-load-path=#{ TRUFFLERUBY_DIR } /src/main/ruby/truffleruby"
1292
1274
options << "-T--polyglot" # For Truffle::Interop.export specs
@@ -1307,20 +1289,10 @@ def test_specs(command, *args)
1307
1289
options << "-T--experimental-options" << "-T--exceptions-print-uncaught-java"
1308
1290
end
1309
1291
1310
- if args . delete ( '--truffle-formatter' )
1311
- options += %w[ --format spec/truffle_formatter.rb ]
1312
- end
1313
-
1314
1292
if ci?
1315
1293
options += %w[ --format specdoc ]
1316
1294
end
1317
1295
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
-
1324
1296
run_mspec env_vars , command , *options , *args
1325
1297
end
1326
1298
private :test_specs
0 commit comments