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, 2 insertions, 13 deletions

diff --git a/py/test/Ice/timeout/Server.py b/py/test/Ice/timeout/Server.py
index 40058144efe..631c6aea27e 100755
--- a/py/test/Ice/timeout/Server.py
+++ b/py/test/Ice/timeout/Server.py
@@ -10,20 +10,9 @@
 
 import os, sys, traceback, time, threading
 
-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!"
-
 import Ice
-
-#
-# Get Slice directory.
-#
-slice_dir = os.path.join(os.path.join(toplevel, "..", "slice"))
-if not os.path.exists(slice_dir):
+slice_dir = Ice.getSliceDir()
+if not slice_dir:
     print sys.argv[0] + ': Slice directory not found.'
     sys.exit(1)