[GR-48041] Prepare 23.1.

PullRequest: js/2902

Author: imanemamri

ci.jsonnet

@@ -48,6 +48,7 @@ local graalNodeJs = import 'graal-nodejs/ci.jsonnet';
     ] else [],
     using_artifact:: false,
     build_standalones:: false,
+    build_dependencies:: if self.build_standalones then ['ALL_GRAALVM_ARTIFACTS'] else ['GRAALVM'],
     setup+: self.graalvm.setup,
     run+: []
       + self.export_envvars
@@ -121,10 +122,8 @@ local graalNodeJs = import 'graal-nodejs/ci.jsonnet';
     run+: [
       mx_base_cmd + ["sversions"],
       mx_base_cmd + ["graalvm-show"],
-      mx_base_cmd + ["build"],
-    ] + (if build.build_standalones then [
-      mx_base_cmd + ["build", "--dependencies", "GRAALVM_STANDALONES"],
-    ] else []),
+      mx_base_cmd + ["build", "--dependencies", std.join(',', build.build_dependencies)],
+    ],
     publishArtifacts+: [
       {
         name: artifactName,

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "6.41.0",
+  "mx_version": "6.42.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

graal-js/ci.jsonnet

@@ -41,8 +41,7 @@ local ci = import '../ci.jsonnet';
     nativeimages+:: ['lib:jsvm', 'lib:jvmcicompiler'],
     extraimagebuilderarguments+:: ['-H:+ReportExceptionStackTraces'],
     run+: [
-      ['mx', 'build'],
-      ['mx', 'build', '--dependencies', 'GRAALVM_STANDALONES'],
+      ['mx', 'build', '--dependencies', 'ALL_GRAALVM_ARTIFACTS'],
       ['set-export', 'GRAALVM_HOME', ['mx', '--quiet', 'graalvm-home']],
       ['${GRAALVM_HOME}/bin/js', '--native', '-e', "print('hello:' + Array.from(new Array(10), (x,i) => i*i ).join('|'))"],
       ['${GRAALVM_HOME}/bin/js', '--native', '../../js-benchmarks/harness.js', '--', '../../js-benchmarks/octane-richards.js', '--show-warmup'],

graal-js/mx.graal-js/mx_graal_js.py

@@ -32,6 +32,8 @@
 import mx_graal_js_benchmark
 import mx, mx_sdk, mx_urlrewrites
 from mx_gate import Tags, Task, add_gate_runner, prepend_gate_runner
+
+import mx_unittest
 from mx_unittest import unittest
 
 _suite = mx.suite('graal-js')
@@ -50,11 +52,15 @@
 
 def get_jdk(forBuild=False):
     # Graal.nodejs requires a JDK at build time, to be passed as argument to `./configure`.
+    # GraalVMJDKConfig (`tag='graalvm'`) is not available until all the components are built.
     # GraalJVMCIJDKConfig (`tag='jvmci'`) is not available until all required jars are built.
-    if not forBuild and mx.suite('compiler', fatalIfMissing=False):
-        return mx.get_jdk(tag='jvmci')
-    else:
-        return mx.get_jdk()
+    if not forBuild:
+        jdk = mx.get_jdk(tag='graalvm')
+        if exists(jdk.home):
+            return jdk
+        elif mx.suite('compiler', fatalIfMissing=False):
+            return mx.get_jdk(tag='jvmci')
+    return mx.get_jdk()
 
 class GraalJsDefaultTags:
     default = 'default'
@@ -135,6 +141,15 @@ def _graal_js_gate_runner(args, tasks):
             finally:
                 os.unlink(jsonResultsFile)
 
+def _unittest_config_participant(config):
+    (vmArgs, mainClass, mainClassArgs) = config
+    vmArgs += ['-Dpolyglotimpl.DisableClassPathIsolation=true']
+    mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.js/*=com.oracle.truffle.js.test']
+    mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.js/*=com.oracle.truffle.js.snapshot']
+    mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.js/*=ALL-UNNAMED']
+    return (vmArgs, mainClass, mainClassArgs)
+
+mx_unittest.add_config_participant(_unittest_config_participant)
 prepend_gate_runner(_suite, _graal_js_pre_gate_runner)
 add_gate_runner(_suite, _graal_js_gate_runner)
 
@@ -244,10 +259,12 @@ def _get_lib_path(_lib_name):
 def _run_test_suite(custom_args, default_vm_args, max_heap, stack_size, main_class, nonZeroIsFatal, cwd):
     _vm_args, _prog_args = parse_js_args(custom_args)
     _vm_args = _append_default_js_vm_args(vm_args=_vm_args, max_heap=max_heap, stack_size=stack_size)
-    _cp = mx.classpath(['TRUFFLE_JS_TESTS']
+    _mp = mx.classpath(['TRUFFLE_JS_TESTS']
         + (['tools:CHROMEINSPECTOR', 'tools:TRUFFLE_PROFILER'] if mx.suite('tools', fatalIfMissing=False) is not None else [])
         + (['wasm:WASM'] if mx.suite('wasm', fatalIfMissing=False) is not None else []))
-    _vm_args = ['-ea', '-esa', '-cp', _cp] + default_vm_args + _vm_args
+    _cp = mx.classpath(['NASHORN_INTERNAL_TESTS'])
+    _exports = ['--add-exports', 'org.graalvm.js/com.oracle.truffle.js.runtime=com.oracle.truffle.js.test']
+    _vm_args = ['-ea', '-esa', '--module-path', _mp, '-cp', _cp] + _exports + default_vm_args + _vm_args
     return mx.run_java(_vm_args + [main_class] + _prog_args, nonZeroIsFatal=nonZeroIsFatal, cwd=cwd, jdk=get_jdk())
 
 def test262(args, nonZeroIsFatal=True):

graal-js/mx.graal-js/suite.py

@@ -24,7 +24,7 @@
         {
            "name" : "regex",
            "subdir" : True,
-           "version" : "87e0f80b1b3c1621e1e0c9f4a3b0f27816b0142f",
+           "version" : "ce7e2791bb11eee493e6c332efe73f589e289e5f",
            "urls" : [
                 {"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
             ]
@@ -73,30 +73,33 @@
     },
 
     "JACKSON_CORE" : {
-      "sha1" : "2ef7b1cc34de149600f5e75bc2d5bf40de894e60",
+      "sha1" : "a6fe1836469a69b3ff66037c324d75fc66ef137c",
       "maven" : {
         "groupId" : "com.fasterxml.jackson.core",
         "artifactId" : "jackson-core",
-        "version" : "2.8.6",
+        "version" : "2.15.2",
       },
+      "moduleName" : "com.fasterxml.jackson.core",
     },
 
     "JACKSON_ANNOTATIONS" : {
-      "sha1" : "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5",
+      "sha1" : "4724a65ac8e8d156a24898d50fd5dbd3642870b8",
       "maven" : {
         "groupId" : "com.fasterxml.jackson.core",
         "artifactId" : "jackson-annotations",
-        "version" : "2.8.6",
+        "version" : "2.15.2",
       },
+      "moduleName" : "com.fasterxml.jackson.annotation",
     },
 
     "JACKSON_DATABIND" : {
-      "sha1" : "c43de61f74ecc61322ef8f402837ba65b0aa2bf4",
+      "sha1" : "9353b021f10c307c00328f52090de2bdb4b6ff9c",
       "maven" : {
         "groupId" : "com.fasterxml.jackson.core",
         "artifactId" : "jackson-databind",
-        "version" : "2.8.6",
+        "version" : "2.15.2",
       },
+      "moduleName" : "com.fasterxml.jackson.databind",
     },
   },
 
@@ -254,7 +257,6 @@
         "sdk:GRAAL_SDK",
         "mx:JUNIT",
         "GRAALJS",
-        "truffle:TRUFFLE_TCK",
         "com.oracle.truffle.js.snapshot",
       ],
       "requires" : [
@@ -269,6 +271,24 @@
       "testProject" : True,
     },
 
+    "com.oracle.truffle.js.test.debug" : {
+      "subDir" : "src",
+      "sourceDirs" : ["src"],
+      "dependencies" : [
+        "sdk:GRAAL_SDK",
+        "mx:JUNIT",
+        "GRAALJS",
+        "TRUFFLE_JS_TESTS",
+        "truffle:TRUFFLE_TCK",
+      ],
+      "annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"],
+      "checkstyle" : "com.oracle.truffle.js",
+      "spotbugs" : "true",
+      "javaCompliance" : "17+",
+      "workingSets" : "Truffle,JavaScript",
+      "testProject" : True,
+    },
+
     "com.oracle.truffle.js.test.instrumentation" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -379,7 +399,6 @@
         "JACKSON_CORE",
         "JACKSON_ANNOTATIONS",
         "JACKSON_DATABIND",
-        "NASHORN_INTERNAL_TESTS",
         "TRUFFLE_JS_SNAPSHOT_TOOL",
       ],
       "annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"],
@@ -412,6 +431,7 @@
         "name" : "org.graalvm.js",
         "exports" : [
           "com.oracle.truffle.js.lang to org.graalvm.truffle",
+          "com.oracle.js.parser to org.graalvm.nodejs",
           "com.oracle.js.parser.ir to org.graalvm.nodejs",
           "com.oracle.truffle.js.builtins to org.graalvm.nodejs",
           "com.oracle.truffle.js.builtins.helper to org.graalvm.nodejs",
@@ -454,6 +474,7 @@
         "MIT",  # JONI regexp engine
       ],
       "allowsJavadocWarnings": True,
+      "useModulePath": True,
     },
 
     "JS_COMMUNITY" : {
@@ -529,6 +550,12 @@
     },
 
     "TRUFFLE_JS_SNAPSHOT_TOOL" : {
+      "moduleInfo" : {
+        "name" : "com.oracle.truffle.js.snapshot",
+        "exports" : [
+          "com.oracle.truffle.js.snapshot",
+        ],
+      },
       "subDir" : "src",
       "dependencies" : ["com.oracle.truffle.js.snapshot"],
       "mainClass" : "com.oracle.truffle.js.snapshot.SnapshotTool",
@@ -563,6 +590,16 @@
     },
 
     "TRUFFLE_JS_TESTS" : {
+      "moduleInfo" : {
+        "name" : "com.oracle.truffle.js.test",
+        "exports" : [
+          # Export everything to junit and dependent test distributions.
+          "com.oracle.truffle.js.test*",
+        ],
+        "opens" : [
+          "com.oracle.truffle.js.test.external.suite to com.fasterxml.jackson.databind",
+        ],
+      },
       "dependencies" : [
         "com.oracle.truffle.js.test",
         "com.oracle.truffle.js.test.external",
@@ -576,11 +613,9 @@
         "JACKSON_CORE",
         "JACKSON_ANNOTATIONS",
         "JACKSON_DATABIND",
-        "NASHORN_INTERNAL_TESTS",
       ],
       "distDependencies" : [
         "GRAALJS",
-        "truffle:TRUFFLE_TCK",
         "TRUFFLE_JS_SNAPSHOT_TOOL",
       ],
       "license": [
@@ -589,6 +624,26 @@
       "maven" : False,
       "description" : "Graal JavaScript Tests",
       "allowsJavadocWarnings": True,
+      "useModulePath": True,
+    },
+
+    "JS_DEBUG_TESTS" : {
+      "subDir" : "src",
+      "javaCompliance" : "17+",
+      "dependencies" : [
+        "com.oracle.truffle.js.test.debug",
+      ],
+      "exclude" : [
+        "mx:HAMCREST",
+        "mx:JUNIT",
+      ],
+      "distDependencies" : [
+        "GRAALJS",
+        "TRUFFLE_JS_TESTS",
+        "sdk:POLYGLOT_TCK",
+        "truffle:TRUFFLE_TCK",
+      ],
+      "maven" : False
     },
 
     "SDK_JS_TESTS" : {

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/debug/DebugBuiltinsTest.java renamed to graal-js/src/com.oracle.truffle.js.test.debug/src/com/oracle/truffle/js/test/debug/DebugBuiltinsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/debug/JSDebugTest.java renamed to graal-js/src/com.oracle.truffle.js.test.debug/src/com/oracle/truffle/js/test/debug/JSDebugTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/debug/RealmTest.java renamed to graal-js/src/com.oracle.truffle.js.test.debug/src/com/oracle/truffle/js/test/debug/RealmTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/debug/TestMetaObject.java renamed to graal-js/src/com.oracle.truffle.js.test.debug/src/com/oracle/truffle/js/test/debug/TestMetaObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/debug/TestScope.java renamed to graal-js/src/com.oracle.truffle.js.test.debug/src/com/oracle/truffle/js/test/debug/TestScope.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0