summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py5
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 [".", "..", "../..", "../../..", "../../../.."]: