diff options
| author | Marc Laukien <marc@zeroc.com> | 2004-02-18 20:42:01 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2004-02-18 20:42:01 +0000 |
| commit | f8862b41182a15d4a71e4784c9fbc6b40d92cce4 (patch) | |
| tree | 1058725372bbe4bfc9ab57da285362514a97fba0 /cpp/config/TestUtil.py | |
| parent | updating version number to 1.3.0 (diff) | |
| download | ice-f8862b41182a15d4a71e4784c9fbc6b40d92cce4.tar.bz2 ice-f8862b41182a15d4a71e4784c9fbc6b40d92cce4.tar.xz ice-f8862b41182a15d4a71e4784c9fbc6b40d92cce4.zip | |
fixes
Diffstat (limited to 'cpp/config/TestUtil.py')
| -rw-r--r-- | cpp/config/TestUtil.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index 3ce69bf66d0..9f328e265de 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -51,6 +51,7 @@ def getIceVersion(): return re.search("ICE_STRING_VERSION \"([0-9\.]*)\"", config.read()).group(1) def getIceSoVersion(): + config = open(os.path.join(toplevel, "include", "IceUtil", "Config.h"), "r") intVersion = int(re.search("ICE_INT_VERSION ([0-9]*)", config.read()).group(1)) majorVersion = intVersion / 10000 @@ -87,7 +88,6 @@ def isHpUx(): else: return 0 - serverPids = [] def killServers(): @@ -146,10 +146,13 @@ def waitServiceReady(pipe, token): break def printOutputFromPipe(pipe): + while 1: + line = pipe.readline() if not line: break + os.write(1, line) for toplevel in [".", "..", "../..", "../../..", "../../../.."]: |