diff options
| author | Jose <jose@zeroc.com> | 2015-05-28 19:58:32 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-05-28 19:58:32 +0200 |
| commit | 8844efa9be7beb4cc70b0517264887d0d4de7b42 (patch) | |
| tree | 3eaa682909fc6b3d0a6b131e5f2286aaf48c0403 /scripts/TestController.py | |
| parent | Fix HttpServer.js location of JS libraries (diff) | |
| download | ice-8844efa9be7beb4cc70b0517264887d0d4de7b42.tar.bz2 ice-8844efa9be7beb4cc70b0517264887d0d4de7b42.tar.xz ice-8844efa9be7beb4cc70b0517264887d0d4de7b42.zip | |
Fix TestController to pass extra arguments to run.py
Diffstat (limited to 'scripts/TestController.py')
| -rw-r--r-- | scripts/TestController.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/TestController.py b/scripts/TestController.py index d56900f7ff7..fb59bc69731 100644 --- a/scripts/TestController.py +++ b/scripts/TestController.py @@ -50,8 +50,10 @@ jar = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "java/test/controller/build/libs/testController-%(version)s.jar" % {"version": version}) javaHome = os.environ.get("JAVA_HOME", "") -javaCmd = '"%s"' % os.path.join(javaHome, "bin", "java") if javaHome else "java" +javaCmd = '%s' % os.path.join(javaHome, "bin", "java") if javaHome else "java" command = [javaCmd, "-jar", jar] +if len(sys.argv) > 1: + command += sys.argv[1:] p = subprocess.Popen(command, shell = False, stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.STDOUT, bufsize = 0) |