Test drivers do not require ICE_HOME if required applications are

available in a directory relative to them.

5 files changed, 20 insertions, 5 deletions

diff --git a/cs/test/Glacier2/attack/run.py b/cs/test/Glacier2/attack/run.py
index c3a8e1c81f5..a6c81aaf0e9 100755
--- a/cs/test/Glacier2/attack/run.py
+++ b/cs/test/Glacier2/attack/run.py
@@ -23,7 +23,10 @@ import TestUtil
 ice_home = None
 if not os.environ.has_key('ICE_HOME'):
     relPath = os.path.join(TestUtil.findTopLevel(), "cpp", "bin") 
-    if os.path.exists(os.path.join(relPath, "glacier2router")):
+    checkfile = "glacier2router"
+    if TestUtil.isWin32():
+        checkfile = checkfile + ".exe" 
+    if os.path.exists(os.path.join(relPath, checkfile)):
         ice_home = os.path.dirname(relPath) 
     else:
         print "ICE_HOME is not defined."
diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py
index fe601dd56ac..183d267ef79 100755
--- a/cs/test/Glacier2/router/run.py
+++ b/cs/test/Glacier2/router/run.py
@@ -23,7 +23,10 @@ import TestUtil
 ice_home = None
 if not os.environ.has_key('ICE_HOME'):
     relPath = os.path.join(TestUtil.findTopLevel(), "cpp", "bin") 
-    if os.path.exists(os.path.join(relPath, "glacier2router")):
+    checkfile = "glacier2router"
+    if TestUtil.isWin32():
+        checkfile = checkfile + ".exe" 
+    if os.path.exists(os.path.join(relPath, checkfile)):
         ice_home = os.path.dirname(relPath) 
     else:
         print "ICE_HOME is not defined."
diff --git a/java/test/Glacier2/attack/run.py b/java/test/Glacier2/attack/run.py
index ab66fea7f6d..f596ca7b99b 100755
--- a/java/test/Glacier2/attack/run.py
+++ b/java/test/Glacier2/attack/run.py
@@ -25,7 +25,10 @@ testdir = os.path.dirname(os.path.abspath(__file__))
 ice_home = None
 if not os.environ.has_key('ICE_HOME'):
     relPath = os.path.join(TestUtil.findTopLevel(), "cpp", "bin") 
-    if os.path.exists(os.path.join(relPath, "glacier2router")):
+    checkfile = "glacier2router"
+    if TestUtil.isWin32():
+        checkfile = checkfile + ".exe" 
+    if os.path.exists(os.path.join(relPath, checkfile)):
         ice_home = os.path.dirname(relPath) 
     else:
         print "ICE_HOME is not defined."
diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py
index bfb9198ebb1..4643082a261 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/Glacier2/router/run.py
@@ -25,7 +25,10 @@ testdir = os.path.dirname(os.path.abspath(__file__))
 ice_home = None
 if not os.environ.has_key('ICE_HOME'):
     relPath = os.path.join(TestUtil.findTopLevel(), "cpp", "bin") 
-    if os.path.exists(os.path.join(relPath, "glacier2router")):
+    checkfile = "glacier2router"
+    if TestUtil.isWin32():
+        checkfile = checkfile + ".exe" 
+    if os.path.exists(os.path.join(relPath, checkfile)):
         ice_home = os.path.dirname(relPath) 
     else:
         print "ICE_HOME is not defined."
diff --git a/java/test/IceGrid/simple/run.py b/java/test/IceGrid/simple/run.py
index e1104f140bd..ac213651943 100755
--- a/java/test/IceGrid/simple/run.py
+++ b/java/test/IceGrid/simple/run.py
@@ -26,7 +26,10 @@ testdir = os.path.dirname(os.path.abspath(__file__))
 ice_home = None
 if not os.environ.has_key('ICE_HOME'):
     relPath = os.path.join(TestUtil.findTopLevel(), "cpp", "bin") 
-    if os.path.exists(os.path.join(relPath, "icegridnode")):
+    checkfile = "icegridnode"
+    if TestUtil.isWin32():
+        checkfile = checkfile + ".exe" 
+    if os.path.exists(os.path.join(relPath, checkfile)):
         ice_home = os.path.dirname(relPath) 
     else:
         print "ICE_HOME is not defined."