Run js tests on the module path (fixes instrument tests).

Author: woess

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

@@ -144,6 +144,9 @@ def _graal_js_gate_runner(args, tasks):
 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)
@@ -256,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

@@ -257,7 +257,6 @@
         "sdk:GRAAL_SDK",
         "mx:JUNIT",
         "GRAALJS",
-        "truffle:TRUFFLE_TCK",
         "com.oracle.truffle.js.snapshot",
       ],
       "requires" : [
@@ -272,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"],
@@ -382,7 +399,6 @@
         "JACKSON_CORE",
         "JACKSON_ANNOTATIONS",
         "JACKSON_DATABIND",
-        "NASHORN_INTERNAL_TESTS",
         "TRUFFLE_JS_SNAPSHOT_TOOL",
       ],
       "annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"],
@@ -458,6 +474,7 @@
         "MIT",  # JONI regexp engine
       ],
       "allowsJavadocWarnings": True,
+      "useModulePath": True,
     },
 
     "JS_COMMUNITY" : {
@@ -533,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",
@@ -567,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",
@@ -580,11 +613,9 @@
         "JACKSON_CORE",
         "JACKSON_ANNOTATIONS",
         "JACKSON_DATABIND",
-        "NASHORN_INTERNAL_TESTS",
       ],
       "distDependencies" : [
         "GRAALJS",
-        "truffle:TRUFFLE_TCK",
         "TRUFFLE_JS_SNAPSHOT_TOOL",
       ],
       "license": [
@@ -593,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/ParseInlineTest.java renamed to graal-js/src/com.oracle.truffle.js.test.debug/src/com/oracle/truffle/js/test/debug/ParseInlineTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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

graal-nodejs/mx.graal-nodejs/mx_graal_nodejs.py

@@ -363,9 +363,9 @@ def node(args, add_graal_vm_args=True, nonZeroIsFatal=True, out=None, err=None,
     return mx.run(prepareNodeCmdLine(args, add_graal_vm_args), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
 
 def testnodeInstrument(args, nonZeroIsFatal=True, out=None, err=None, cwd=None):
-    instrument_cp = mx.classpath(['TRUFFLENODE_TEST'])
-    _setEnvVar('NODE_JVM_CLASSPATH', instrument_cp)
-    _setEnvVar('NODE_JVM_OPTIONS', ' '.join(['-ea', '-Dpolyglotimpl.DisableClassPathIsolation=true']))
+    instrument_mp = mx.classpath(['TRUFFLENODE_TEST'])
+    _setEnvVar('NODE_JVM_MODULE_PATH', instrument_mp)
+    _setEnvVar('NODE_JVM_OPTIONS', ' '.join(['-ea', '--add-exports=org.graalvm.js/com.oracle.truffle.js.nodes.instrumentation=com.oracle.truffle.trufflenode.test']))
     test = join(_suite.dir, 'test', 'graal', 'instrument', 'async-test.js')
     node(['--experimental-options', '--testing-agent', test], nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
     node(['--experimental-options', '--broken-instrument', '-e', '6*7'], nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)

graal-nodejs/mx.graal-nodejs/suite.py

@@ -185,6 +185,9 @@
       },
     },
     "TRUFFLENODE_TEST" : {
+      "moduleInfo" : {
+        "name" : "com.oracle.truffle.trufflenode.test",
+      },
       "subdir" : "mx.graal-nodejs",
       "dependencies" : ["com.oracle.truffle.trufflenode.test"],
       "distDependencies" : [
@@ -193,7 +196,8 @@
       "description" : "Graal Node.js testing",
       "maven" : {
         "artifactId" : "graal-nodejs-test",
-      }
+      },
+      "useModulePath": True,
     },
   },
 }