[GR-47035] Create JVM standalones by default for jvm* env files

eregon · eregon · commit f954b460561f · 2023-08-18T09:46:00.000Z
PullRequest: truffleruby/3950
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -302,7 +302,8 @@ local part_definitions = {
 
   run: {
     test_unit_tck: {
-      run+: jt(["test", "unit", "--verbose"]) +
+      run+: jt(["mx", "build"]) +
+            jt(["test", "unit", "--verbose"]) +
             jt(["test", "tck"])
     },
 
diff --git a/mx.truffleruby/jvm b/mx.truffleruby/jvm
@@ -1,3 +1,6 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools
 COMPONENTS=TruffleRuby,suite:tools
+# To also create the standalone
+INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ce b/mx.truffleruby/jvm-ce
@@ -1,3 +1,6 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler
+# To also create the standalone
+INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ce-libgraal b/mx.truffleruby/jvm-ce-libgraal
@@ -2,3 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,LibGraal
 NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
+# To also create the standalone
+INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ce-ntl b/mx.truffleruby/jvm-ce-ntl
@@ -2,3 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM
 NATIVE_IMAGES=suite:sulong
+# To also create the standalone
+INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ee b/mx.truffleruby/jvm-ee
@@ -1,3 +1,6 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/truffleruby-enterprise,/graal-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise
+# To also create the standalone
+INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ee-libgraal b/mx.truffleruby/jvm-ee-libgraal
@@ -2,3 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/truffleruby-enterprise,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,SubstrateVM Enterprise,LibGraal Enterprise
 NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
+# To also create the standalone
+INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ee-ntl b/mx.truffleruby/jvm-ee-ntl
@@ -2,3 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/truffleruby-enterprise,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,SubstrateVM Enterprise
 NATIVE_IMAGES=suite:sulong
+# To also create the standalone
+INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/mx_truffleruby.py b/mx.truffleruby/mx_truffleruby.py
@@ -143,9 +143,10 @@ def build_truffleruby(args):
 
 def ruby_check_heap_dump(input_args, out=None):
     print("mx ruby_check_heap_dump " + " ".join(input_args))
+    dists = ['TRUFFLERUBY', 'TRUFFLE_NFI', 'SULONG_NATIVE', 'TRUFFLERUBY-TEST']
+    mx.command_function('build')(['--dependencies', ','.join(dists)])
     args = input_args
     args.insert(0, "--experimental-options")
-    dists = ['TRUFFLERUBY', 'TRUFFLE_NFI', 'SULONG_NATIVE', 'TRUFFLERUBY-TEST']
     vm_args, truffleruby_args = mx.extract_VM_args(args, useDoubleDash=True, defaultAllVMArgs=False)
     vm_args += mx.get_runtime_jvm_args(dists)
     # vm_args.append("-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y")
diff --git a/mx.truffleruby/native b/mx.truffleruby/native
@@ -5,3 +5,4 @@ NATIVE_IMAGES=suite:sulong,lib:rubyvm
 EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json
 # To also create the standalone
 INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/native-ee b/mx.truffleruby/native-ee
@@ -5,3 +5,4 @@ NATIVE_IMAGES=suite:sulong,lib:rubyvm
 EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json
 # To also create the standalone
 INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/native-ee-aux b/mx.truffleruby/native-ee-aux
@@ -6,3 +6,4 @@ EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:BuildOutputJSONFile=native-image-build-r
 NATIVE_IMAGE_AUXILIARY_ENGINE_CACHE=true
 # To also create the standalone
 INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/native-host-inlining b/mx.truffleruby/native-host-inlining
@@ -5,3 +5,4 @@ NATIVE_IMAGES=lib:rubyvm
 EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-Dgraal.LogFile=host-inlining.txt
 # To also create the standalone
 INSTALLABLES=TruffleRuby
+BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/test/mri/excludes/TestAutoload.rb b/test/mri/excludes/TestAutoload.rb
@@ -1,3 +1,4 @@
 exclude :test_source_location, "needs investigation"
 exclude :test_threaded_accessing_inner_constant, "Exception raised:"
 exclude :test_autoload_parent_namespace, "expected: /\\/some_const.rb to define SomeNamespace::SomeConst but it didn't/"
+exclude :test_autoload_parallel_race, "transient timeout"
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -1165,6 +1165,10 @@ def test(*args)
     require_ruby_launcher!
     path, *rest = args
 
+    if %w[unit unittest tck].include?(path)
+      puts bold "NOTE: You need `jt mx build` before running `jt test #{path}` to build the relevant test distributions"
+    end
+
     case path
     when nil
       %w[specs mri bundle cexts integration gems ecosystem compiler].each do |kind|
@@ -1187,7 +1191,8 @@ def test(*args)
       tests = tests.empty? ? ['org.truffleruby'] : tests
       # TODO (eregon, 4 Feb 2019): This should run on GraalVM, not development jars
       mx(*mx_options, 'unittest', *unittest_options, *tests)
-    when 'tck' then mx 'tck', *rest
+    when 'tck'
+      mx 'tck', *rest
     else
       if File.expand_path(path, TRUFFLERUBY_DIR).start_with?("#{TRUFFLERUBY_DIR}/test")
         test_mri(*args)
diff --git a/tool/make-standalone-distribution.sh b/tool/make-standalone-distribution.sh
@@ -10,7 +10,7 @@ set -e
 set -x
 
 # Build
-bin/jt build --env native -- --targets=GRAALVM_STANDALONES
+bin/jt build --env native
 
 standalone=$(bin/jt mx --env native standalone-home ruby)
 release_home="$PWD/mxbuild/truffleruby-standalone"
