diff options
| author | Jose <jose@zeroc.com> | 2013-09-19 18:56:22 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-09-19 18:56:22 +0200 |
| commit | fa5d30a3f1dc9a10a4df74bc993f4d776e198b79 (patch) | |
| tree | fad27ca88c380b7e206577ca5e4d47202c9b107a /demoscript/Util.py | |
| parent | Remove unused method getRelease (diff) | |
| download | ice-fa5d30a3f1dc9a10a4df74bc993f4d776e198b79.tar.bz2 ice-fa5d30a3f1dc9a10a4df74bc993f4d776e198b79.tar.xz ice-fa5d30a3f1dc9a10a4df74bc993f4d776e198b79.zip | |
Disable IPv6 multicast demo when running in Windows with Java 1.6
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index ebe8fa3704a..0fab3417ac7 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -55,7 +55,15 @@ host = "127.0.0.1" # debug = False - +def getJavaVersion(): + p = subprocess.Popen(javaCmd + " -version", shell = True, stdout = subprocess.PIPE, stderr = subprocess.STDOUT) + if(p.wait() != 0): + print(javaCmd + " -version failed:\n" + p.stdout.read().strip()) + sys.exit(1) + matchVersion = re.compile('java version \"(.*)\"') + m = matchVersion.match(p.stdout.readline().decode('UTF-8')) + return m.group(1) + class filereader(Expect.reader): def __init__(self, desc, p): Expect.reader.__init__(self, desc, p, None) |