Disable class-path isolation for js unit tests and testnodeinstrument.

Author: woess

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')
@@ -139,6 +141,12 @@ def _graal_js_gate_runner(args, tasks):
             finally:
                 os.unlink(jsonResultsFile)
 
+def _unittest_config_participant(config):
+    (vmArgs, mainClass, mainClassArgs) = config
+    vmArgs += ['-Dpolyglotimpl.DisableClassPathIsolation=true']
+    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)
 

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

@@ -365,8 +365,9 @@ def node(args, add_graal_vm_args=True, nonZeroIsFatal=True, out=None, err=None,
 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']))
     test = join(_suite.dir, 'test', 'graal', 'instrument', 'async-test.js')
-    node(['--experimental-options', '--testing-agent', '-ea', test], nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
+    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)
     node(['--experimental-options', '--coverage-like-instrument', '-e', '6*7'], nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)