Fixes to allow building/running tests against binary distribution

51 files changed, 0 insertions, 151 deletions

diff --git a/py/test/Ice/adapterDeactivation/Client.py b/py/test/Ice/adapterDeactivation/Client.py
index 4637d93a02d..30027f180b2 100644
--- a/py/test/Ice/adapterDeactivation/Client.py
+++ b/py/test/Ice/adapterDeactivation/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, AllTests
diff --git a/py/test/Ice/adapterDeactivation/Collocated.py b/py/test/Ice/adapterDeactivation/Collocated.py
index 88e8b2f5bfc..d9d33612bff 100644
--- a/py/test/Ice/adapterDeactivation/Collocated.py
+++ b/py/test/Ice/adapterDeactivation/Collocated.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI, AllTests
diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py
index 6e05ae3f20a..20c663efaa3 100644
--- a/py/test/Ice/adapterDeactivation/Server.py
+++ b/py/test/Ice/adapterDeactivation/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI
diff --git a/py/test/Ice/binding/Client.py b/py/test/Ice/binding/Client.py
index 8a209ef166a..ceb94b83a78 100644
--- a/py/test/Ice/binding/Client.py
+++ b/py/test/Ice/binding/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 Ice.loadSlice('Test.ice')
diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py
index 9251acf0841..39b5e5d211c 100644
--- a/py/test/Ice/binding/Server.py
+++ b/py/test/Ice/binding/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI
diff --git a/py/test/Ice/blobject/Client.py b/py/test/Ice/blobject/Client.py
index 26381353d00..b0645fc0552 100644
--- a/py/test/Ice/blobject/Client.py
+++ b/py/test/Ice/blobject/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test
diff --git a/py/test/Ice/blobject/Server.py b/py/test/Ice/blobject/Server.py
index 986f1825fa3..af986ad5dd3 100644
--- a/py/test/Ice/blobject/Server.py
+++ b/py/test/Ice/blobject/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 Ice.loadSlice('Test.ice')
diff --git a/py/test/Ice/checksum/Client.py b/py/test/Ice/checksum/Client.py
index 36d291c11d2..1290c7ae641 100644
--- a/py/test/Ice/checksum/Client.py
+++ b/py/test/Ice/checksum/Client.py
@@ -17,8 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/checksum/Server.py b/py/test/Ice/checksum/Server.py
index 7b4f6a1cd7e..0f3fc551cf4 100644
--- a/py/test/Ice/checksum/Server.py
+++ b/py/test/Ice/checksum/Server.py
@@ -17,8 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/custom/Client.py b/py/test/Ice/custom/Client.py
index 16fe589378c..b2b2e281a4f 100644
--- a/py/test/Ice/custom/Client.py
+++ b/py/test/Ice/custom/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, AllTests
diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py
index 6b15244fe5b..8a2f638971e 100644
--- a/py/test/Ice/custom/Server.py
+++ b/py/test/Ice/custom/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test
diff --git a/py/test/Ice/exceptions/Client.py b/py/test/Ice/exceptions/Client.py
index 173a56127cf..af419d19e1d 100644
--- a/py/test/Ice/exceptions/Client.py
+++ b/py/test/Ice/exceptions/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import AllTests
diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py
index bec27c63d4e..50aab50055f 100644
--- a/py/test/Ice/exceptions/Collocated.py
+++ b/py/test/Ice/exceptions/Collocated.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI, AllTests
diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py
index 68145921ae1..f89adc3b362 100644
--- a/py/test/Ice/exceptions/Server.py
+++ b/py/test/Ice/exceptions/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI
diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py
index 30b1bf2eadb..38580006f7a 100644
--- a/py/test/Ice/exceptions/ServerAMD.py
+++ b/py/test/Ice/exceptions/ServerAMD.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('TestAMD.ice')
 import Test
diff --git a/py/test/Ice/facets/Client.py b/py/test/Ice/facets/Client.py
index 90ec29f8af2..91623582c73 100644
--- a/py/test/Ice/facets/Client.py
+++ b/py/test/Ice/facets/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 Ice.loadSlice('Test.ice')
diff --git a/py/test/Ice/facets/Collocated.py b/py/test/Ice/facets/Collocated.py
index c7bd0a22047..ca9e6dc665c 100644
--- a/py/test/Ice/facets/Collocated.py
+++ b/py/test/Ice/facets/Collocated.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI, AllTests
diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py
index 1c2b25f1dbe..dbe3b98c7f5 100644
--- a/py/test/Ice/facets/Server.py
+++ b/py/test/Ice/facets/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI
diff --git a/py/test/Ice/faultTolerance/Client.py b/py/test/Ice/faultTolerance/Client.py
index a5d13fe97c2..a0640c58c20 100644
--- a/py/test/Ice/faultTolerance/Client.py
+++ b/py/test/Ice/faultTolerance/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice, AllTests
 
 def test(b):
diff --git a/py/test/Ice/faultTolerance/Server.py b/py/test/Ice/faultTolerance/Server.py
index 892f6e7f0ec..e753c4fbb6a 100644
--- a/py/test/Ice/faultTolerance/Server.py
+++ b/py/test/Ice/faultTolerance/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test
diff --git a/py/test/Ice/inheritance/Client.py b/py/test/Ice/inheritance/Client.py
index 641864a60a5..1c68ab740a9 100644
--- a/py/test/Ice/inheritance/Client.py
+++ b/py/test/Ice/inheritance/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import AllTests
diff --git a/py/test/Ice/inheritance/Collocated.py b/py/test/Ice/inheritance/Collocated.py
index 1e9a2d0661d..202292cf7bc 100644
--- a/py/test/Ice/inheritance/Collocated.py
+++ b/py/test/Ice/inheritance/Collocated.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI, AllTests
diff --git a/py/test/Ice/inheritance/Server.py b/py/test/Ice/inheritance/Server.py
index f8b762516b4..0ea27904b8c 100644
--- a/py/test/Ice/inheritance/Server.py
+++ b/py/test/Ice/inheritance/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI
diff --git a/py/test/Ice/location/Client.py b/py/test/Ice/location/Client.py
index 1d1b66473a7..a790e448062 100644
--- a/py/test/Ice/location/Client.py
+++ b/py/test/Ice/location/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/location/Server.py b/py/test/Ice/location/Server.py
index 7a6137fa90a..a1b2213865c 100644
--- a/py/test/Ice/location/Server.py
+++ b/py/test/Ice/location/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/objects/Client.py b/py/test/Ice/objects/Client.py
index 87c05a37f00..073a47e6c54 100644
--- a/py/test/Ice/objects/Client.py
+++ b/py/test/Ice/objects/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 Ice.loadSlice('ClientPrivate.ice')
diff --git a/py/test/Ice/objects/Collocated.py b/py/test/Ice/objects/Collocated.py
index 29473c4455f..9db84e6d90c 100644
--- a/py/test/Ice/objects/Collocated.py
+++ b/py/test/Ice/objects/Collocated.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 Ice.loadSlice('ClientPrivate.ice')
diff --git a/py/test/Ice/objects/Server.py b/py/test/Ice/objects/Server.py
index 330502b1f08..7aee9423d4a 100644
--- a/py/test/Ice/objects/Server.py
+++ b/py/test/Ice/objects/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 Ice.loadSlice('ServerPrivate.ice')
diff --git a/py/test/Ice/operations/Client.py b/py/test/Ice/operations/Client.py
index fc5195e3dc3..fd40440b63d 100644
--- a/py/test/Ice/operations/Client.py
+++ b/py/test/Ice/operations/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 #
 # Find Slice directory.
 #
diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py
index b4952252ed7..87156b9717f 100644
--- a/py/test/Ice/operations/Collocated.py
+++ b/py/test/Ice/operations/Collocated.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 #
 # Find Slice directory.
 #
diff --git a/py/test/Ice/operations/Server.py b/py/test/Ice/operations/Server.py
index 2280dd4f0de..1029e30bf77 100644
--- a/py/test/Ice/operations/Server.py
+++ b/py/test/Ice/operations/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py
index 9ec866147ae..7f4d375856e 100644
--- a/py/test/Ice/operations/ServerAMD.py
+++ b/py/test/Ice/operations/ServerAMD.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/proxy/Client.py b/py/test/Ice/proxy/Client.py
index d2e923996f0..433e7496c1f 100644
--- a/py/test/Ice/proxy/Client.py
+++ b/py/test/Ice/proxy/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 #
 # Find Slice directory.
 #
diff --git a/py/test/Ice/proxy/Collocated.py b/py/test/Ice/proxy/Collocated.py
index b4952252ed7..87156b9717f 100644
--- a/py/test/Ice/proxy/Collocated.py
+++ b/py/test/Ice/proxy/Collocated.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 #
 # Find Slice directory.
 #
diff --git a/py/test/Ice/proxy/Server.py b/py/test/Ice/proxy/Server.py
index 08963659b61..a95d8cb9b97 100644
--- a/py/test/Ice/proxy/Server.py
+++ b/py/test/Ice/proxy/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/proxy/ServerAMD.py b/py/test/Ice/proxy/ServerAMD.py
index 7daaff7f2e7..44942cb3d93 100644
--- a/py/test/Ice/proxy/ServerAMD.py
+++ b/py/test/Ice/proxy/ServerAMD.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/retry/Client.py b/py/test/Ice/retry/Client.py
index 16ccf4dfcdd..5ed7ddf502e 100644
--- a/py/test/Ice/retry/Client.py
+++ b/py/test/Ice/retry/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 #
 # Find Slice directory.
 #
diff --git a/py/test/Ice/retry/Server.py b/py/test/Ice/retry/Server.py
index 4b2810d9f16..5b22ee403cd 100644
--- a/py/test/Ice/retry/Server.py
+++ b/py/test/Ice/retry/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 #
diff --git a/py/test/Ice/servantLocator/Client.py b/py/test/Ice/servantLocator/Client.py
index 93a573c49dd..d89bcd2360f 100644
--- a/py/test/Ice/servantLocator/Client.py
+++ b/py/test/Ice/servantLocator/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, AllTests
diff --git a/py/test/Ice/servantLocator/Collocated.py b/py/test/Ice/servantLocator/Collocated.py
index 69bb9a8efb4..1cd88fe9f5e 100644
--- a/py/test/Ice/servantLocator/Collocated.py
+++ b/py/test/Ice/servantLocator/Collocated.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI, AllTests
diff --git a/py/test/Ice/servantLocator/Server.py b/py/test/Ice/servantLocator/Server.py
index 4ff06e2c8fa..08abc51e980 100644
--- a/py/test/Ice/servantLocator/Server.py
+++ b/py/test/Ice/servantLocator/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('Test.ice')
 import Test, TestI
diff --git a/py/test/Ice/servantLocator/ServerAMD.py b/py/test/Ice/servantLocator/ServerAMD.py
index 1fa0ddb8528..92a3e9155bb 100644
--- a/py/test/Ice/servantLocator/ServerAMD.py
+++ b/py/test/Ice/servantLocator/ServerAMD.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('TestAMD.ice')
 import Test, TestAMDI
diff --git a/py/test/Ice/slicing/exceptions/Client.py b/py/test/Ice/slicing/exceptions/Client.py
index 4ab94bba819..01c3a6979e7 100644
--- a/py/test/Ice/slicing/exceptions/Client.py
+++ b/py/test/Ice/slicing/exceptions/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice, AllTests
 
 def run(args, communicator):
diff --git a/py/test/Ice/slicing/exceptions/Server.py b/py/test/Ice/slicing/exceptions/Server.py
index 49dbd158540..9e4e6ccc796 100644
--- a/py/test/Ice/slicing/exceptions/Server.py
+++ b/py/test/Ice/slicing/exceptions/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('-I. --all ServerPrivate.ice')
 import Test
diff --git a/py/test/Ice/slicing/exceptions/ServerAMD.py b/py/test/Ice/slicing/exceptions/ServerAMD.py
index 35167d0afc7..e3ffecca749 100644
--- a/py/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/py/test/Ice/slicing/exceptions/ServerAMD.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('-I. --all ServerPrivateAMD.ice')
 import Test
diff --git a/py/test/Ice/slicing/objects/Client.py b/py/test/Ice/slicing/objects/Client.py
index 4ab94bba819..01c3a6979e7 100644
--- a/py/test/Ice/slicing/objects/Client.py
+++ b/py/test/Ice/slicing/objects/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice, AllTests
 
 def run(args, communicator):
diff --git a/py/test/Ice/slicing/objects/Server.py b/py/test/Ice/slicing/objects/Server.py
index 41add90c8ab..b7d6ee15d47 100644
--- a/py/test/Ice/slicing/objects/Server.py
+++ b/py/test/Ice/slicing/objects/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('-I. --all ServerPrivate.ice Forward.ice')
 import Test
diff --git a/py/test/Ice/slicing/objects/ServerAMD.py b/py/test/Ice/slicing/objects/ServerAMD.py
index 75c41bd3639..54860e7cd1c 100644
--- a/py/test/Ice/slicing/objects/ServerAMD.py
+++ b/py/test/Ice/slicing/objects/ServerAMD.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 Ice.loadSlice('-I. --all ServerPrivateAMD.ice Forward.ice')
 import Test
diff --git a/py/test/Ice/timeout/Client.py b/py/test/Ice/timeout/Client.py
index 368fb00d774..ae6185697b8 100644
--- a/py/test/Ice/timeout/Client.py
+++ b/py/test/Ice/timeout/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 #
 # Find Slice directory.
 #
diff --git a/py/test/Ice/timeout/Server.py b/py/test/Ice/timeout/Server.py
index ecccbef1218..5b6aa213522 100644
--- a/py/test/Ice/timeout/Server.py
+++ b/py/test/Ice/timeout/Server.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 #
diff --git a/py/test/Slice/keyword/Client.py b/py/test/Slice/keyword/Client.py
index 94faca977c9..aa8bdc11b46 100644
--- a/py/test/Slice/keyword/Client.py
+++ b/py/test/Slice/keyword/Client.py
@@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.insert(0, os.path.join(toplevel, "python"))
-sys.path.insert(0, os.path.join(toplevel, "lib"))
-
 import Ice
 
 Ice.loadSlice('Key.ice')