From 093b3ec0741c50462ffd2cd5afd9d07dbf6e42be Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 28 Jan 2015 10:35:55 +0100 Subject: Fixed (ICE-6190) - Improve WinRT ssl/wss testing --- scripts/TestController.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/TestController.py') 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): -- cgit v1.2.3