diff options
| author | Jose <jose@zeroc.com> | 2015-01-28 10:35:55 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-01-28 10:35:55 +0100 |
| commit | 093b3ec0741c50462ffd2cd5afd9d07dbf6e42be (patch) | |
| tree | c22963fd0fb80c832d7f6ef70a323d57765f65d5 /scripts/TestController.py | |
| parent | Added test for ICE-5833, generated #include in headers files (diff) | |
| download | ice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.tar.bz2 ice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.tar.xz ice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.zip | |
Fixed (ICE-6190) - Improve WinRT ssl/wss testing
Diffstat (limited to 'scripts/TestController.py')
| -rw-r--r-- | scripts/TestController.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/TestController.py b/scripts/TestController.py index cb227108f99..79eb620397b 100644 --- a/scripts/TestController.py +++ b/scripts/TestController.py @@ -44,14 +44,15 @@ if TestUtil.isDarwin(): version = "3.6b" jar = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "java/test/controller/build/libs/testController-%(version)s.jar" % {"version": version}) -command = ("java -jar %(jar)s" % {"jar":jar}) +command = ["%s/bin/java" % os.environ.get("JAVA_HOME"), "-jar", jar] -p = subprocess.Popen(command, shell = True, stdin = subprocess.PIPE, stdout = subprocess.PIPE, +p = subprocess.Popen(command, shell = False, stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.STDOUT, bufsize = 0) def signal_handler(signal, frame): if p: p.terminate() + sys.exit(0) signal.signal(signal.SIGINT, signal_handler) while(True): |