From a1aaac0e077cc4b4a97a985a9947d6415c771932 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Thu, 17 Sep 2015 15:05:23 -0230
Subject: ICE-6774 added iceboxadmin test to IceBox/admin

---
 scripts/TestUtil.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'scripts/TestUtil.py')

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 36bfd5c7d1e..6b22fbc1faf 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -777,7 +777,6 @@ def phpSetup(clientConfig = False, iceOptions = None, iceProfile = None):
     tmpini.close()
 
 def getIceBox():
-    global compact
     global cpp11
 
     #
@@ -799,15 +798,22 @@ def getIceBox():
     elif lang == "java":
         iceBox = "IceBox.Server"
     elif lang == "csharp":
-        if compact:
-            iceBox = os.path.join(getIceDir("csharp"), "bin", "cf", "iceboxnet")
-        else:
-            iceBox = os.path.join(getIceDir("csharp"), "bin", "iceboxnet")
+        iceBox = os.path.join(getIceDir("csharp"), "bin", "iceboxnet")
 
     return iceBox
 
 def getIceBoxAdmin():
-    return getIceExe("iceboxadmin")
+    #
+    # Get and return the path of the IceBoxAdmin executable
+    #
+    lang = getDefaultMapping()
+    if lang == "java":
+        iceBoxAdmin = "IceBox.Admin"
+    else:
+        return getIceExe("iceboxadmin")
+        iceBoxAdmin = "iceboxadmin"
+
+    return iceBoxAdmin
 
 def getIceGridAdmin():
     return getIceExe("icegridadmin")
-- 
cgit v1.2.3