diff options
| author | Jose <jose@zeroc.com> | 2018-08-02 11:48:30 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-08-02 11:48:30 +0200 |
| commit | 9417fad26a0ed34872df27b0e5b0b8737274ae21 (patch) | |
| tree | c1d98c51149f899276cf5b628b51370f32ff582d /scripts/Util.py | |
| parent | Fix IcePHP sequences order (diff) | |
| download | ice-9417fad26a0ed34872df27b0e5b0b8737274ae21.tar.bz2 ice-9417fad26a0ed34872df27b0e5b0b8737274ae21.tar.xz ice-9417fad26a0ed34872df27b0e5b0b8737274ae21.zip | |
Update JavaScript tests to use TestHelper class
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index a47b7cf3132..745b7c67366 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -3665,7 +3665,7 @@ class JavaScriptMapping(Mapping): def getCommandLine(self, current, process, exe, args): if current.config.es5: - return "node {0}/test/es5/Common/run.js --es5 {1} {2}".format(self.path, exe, args) + return "node {0}/test/es5/Common/run.js {1} {2}".format(self.path, exe, args) else: return "node {0}/test/Common/run.js {1} {2}".format(self.path, exe, args) @@ -3677,7 +3677,11 @@ class JavaScriptMapping(Mapping): def getEnv(self, process, current): env = Mapping.getEnv(self, process, current) - env["NODE_PATH"] = self.getTestCwd(process, current) + commonPath = os.path.join(self.getPath(), "test") + if current.config.es5: + commonPath = os.path.join(commonPath, "es5") + commonPath = os.path.join(commonPath, "Common") + env["NODE_PATH"] = os.pathsep.join([commonPath, self.getTestCwd(process, current)]) return env def getSSLProps(self, process, current): |