summaryrefslogtreecommitdiff
path: root/scripts/TestController.py
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-07-31 13:29:31 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-07-31 13:29:31 -0230
commitada98b8bdca55a3d118bd1134cc35e870b9b41b8 (patch)
tree91dd1927d73d978d8ed345e8c24f62752f118390 /scripts/TestController.py
parentFix for Windows Berkeley DB env (diff)
downloadice-ada98b8bdca55a3d118bd1134cc35e870b9b41b8.tar.bz2
ice-ada98b8bdca55a3d118bd1134cc35e870b9b41b8.tar.xz
ice-ada98b8bdca55a3d118bd1134cc35e870b9b41b8.zip
Changed version setting in TestController.py so that fixIceVersion.py will update it
Diffstat (limited to 'scripts/TestController.py')
-rw-r--r--scripts/TestController.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/TestController.py b/scripts/TestController.py
index fb59bc69731..ef2ebfc55f5 100644
--- a/scripts/TestController.py
+++ b/scripts/TestController.py
@@ -45,9 +45,9 @@ if TestUtil.isDarwin():
except getopt.GetoptError:
pass
-version = "3.6.0"
+iceVersion = "3.6.1"
jar = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..",
- "java/test/controller/build/libs/testController-%(version)s.jar" % {"version": version})
+ "java/test/controller/build/libs/testController-%(iceVersion)s.jar" % {"iceVersion": iceVersion})
javaHome = os.environ.get("JAVA_HOME", "")
javaCmd = '%s' % os.path.join(javaHome, "bin", "java") if javaHome else "java"