http://bugzilla/bugzilla/show_bug.cgi?id=3265

- Simplified the python implementation of Ice.getSliceDir
- Added ruby implementation of Ice.getSliceDir
- Adjusted demos & tests to use Ice.getSliceDir appropriately.

1 files changed, 3 insertions, 13 deletions

diff --git a/py/test/Ice/operations/Client.py b/py/test/Ice/operations/Client.py
index 9a0c6494b99..e4a3fd608f4 100755
--- a/py/test/Ice/operations/Client.py
+++ b/py/test/Ice/operations/Client.py
@@ -10,22 +10,12 @@
 
 import os, sys, traceback
 
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "python", "Ice.py")):
-        break
-else:
-    raise "can't find toplevel directory!"
-
-#
-# Get Slice directory.
-#
-slice_dir = os.path.join(os.path.join(toplevel, "..", "slice"))
-if not os.path.exists(slice_dir):
+import Ice
+slice_dir = Ice.getSliceDir()
+if not slice_dir:
     print sys.argv[0] + ': Slice directory not found.'
     sys.exit(1)
 
-import Ice
 Ice.loadSlice('-I' + slice_dir + ' Test.ice')
 import AllTests