diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-04-21 12:57:45 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-04-21 12:57:45 -0700 |
| commit | d873f0afd752c707b7fe50c217c643ab4b8cdb18 (patch) | |
| tree | 6323aa9486b181d0d2dc677f85a213029748650f /scripts/TestController.py | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-d873f0afd752c707b7fe50c217c643ab4b8cdb18.tar.bz2 ice-d873f0afd752c707b7fe50c217c643ab4b8cdb18.tar.xz ice-d873f0afd752c707b7fe50c217c643ab4b8cdb18.zip | |
ICE-6861 - JavaScript stream changes
Diffstat (limited to 'scripts/TestController.py')
| -rw-r--r-- | scripts/TestController.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/TestController.py b/scripts/TestController.py index dd029fb8418..718a117caa6 100644 --- a/scripts/TestController.py +++ b/scripts/TestController.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import os, sys, threading, subprocess, getopt, signal +import os, sys, threading, subprocess, getopt, signal, re path = [ ".", "..", "../..", "../../..", "../../../.." ] head = os.path.dirname(sys.argv[0]) @@ -45,7 +45,9 @@ if TestUtil.isDarwin(): except getopt.GetoptError: pass -iceVersion = "3.7.0" +props = open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "java", "gradle.properties"), "r") +iceVersion = re.search("iceVersion *= *([-.0-9a-z]*)", props.read()).group(1) + jar = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "java/test/controller/build/libs/testController-%(iceVersion)s.jar" % {"iceVersion": iceVersion}) |