Skip to content

Commit 8c19657

Browse files
committed
Create JVM standalones by default for jvm* env files and only build GraalVM + standalone
* Except for `jt test unit` and `jt test tck` which need a full `mx build` before.
1 parent be107bc commit 8c19657

File tree

9 files changed

+29
-2
lines changed

9 files changed

+29
-2
lines changed

ci.jsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,8 @@ local part_definitions = {
299299

300300
run: {
301301
test_unit_tck: {
302-
run+: jt(["test", "unit", "--verbose"]) +
302+
run+: jt(["mx", "build"]) +
303+
jt(["test", "unit", "--verbose"]) +
303304
jt(["test", "tck"])
304305
},
305306

mx.truffleruby/jvm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools
33
COMPONENTS=TruffleRuby,suite:tools
4+
# To also create the standalone
5+
INSTALLABLES=TruffleRuby
6+
BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES

mx.truffleruby/jvm-ce

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools,/compiler
33
COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler
4+
# To also create the standalone
5+
INSTALLABLES=TruffleRuby
6+
BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES

mx.truffleruby/jvm-ce-libgraal

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
33
COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,LibGraal
44
NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
5+
# To also create the standalone
6+
INSTALLABLES=TruffleRuby
7+
BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES

mx.truffleruby/jvm-ce-ntl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
33
COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM
44
NATIVE_IMAGES=suite:sulong
5+
# To also create the standalone
6+
INSTALLABLES=TruffleRuby
7+
BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES

mx.truffleruby/jvm-ee

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools,/graal-enterprise
33
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise
4+
# To also create the standalone
5+
INSTALLABLES=TruffleRuby
6+
BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES

mx.truffleruby/jvm-ee-libgraal

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
33
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,SubstrateVM Enterprise,LibGraal Enterprise
44
NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
5+
# To also create the standalone
6+
INSTALLABLES=TruffleRuby
7+
BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES

mx.truffleruby/jvm-ee-ntl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
33
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,SubstrateVM Enterprise
44
NATIVE_IMAGES=suite:sulong
5+
# To also create the standalone
6+
INSTALLABLES=TruffleRuby
7+
BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES

tool/jt.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,6 +1152,10 @@ def test(*args)
11521152
require_ruby_launcher!
11531153
path, *rest = args
11541154

1155+
if %w[unit unittest tck].include?(path)
1156+
puts bold "NOTE: You need `jt mx build` before running `jt test #{path}` to build the relevant test distributions"
1157+
end
1158+
11551159
case path
11561160
when nil
11571161
%w[specs mri bundle cexts integration gems ecosystem compiler].each do |kind|
@@ -1174,7 +1178,8 @@ def test(*args)
11741178
tests = tests.empty? ? ['org.truffleruby'] : tests
11751179
# TODO (eregon, 4 Feb 2019): This should run on GraalVM, not development jars
11761180
mx(*mx_options, 'unittest', *unittest_options, *tests)
1177-
when 'tck' then mx 'tck', *rest
1181+
when 'tck'
1182+
mx 'tck', *rest
11781183
else
11791184
if File.expand_path(path, TRUFFLERUBY_DIR).start_with?("#{TRUFFLERUBY_DIR}/test")
11801185
test_mri(*args)

0 commit comments

Comments
 (0)