- Moved cpp/slice to slice

- Merged all TestUtil.py modules to config/TestUtil.py
- Moved all certs to config/certs
- Updated test scripts to refer to new TestUtil.py module and use new
  interfaces
- Updated build systems to refer to new slice location
- Moved cpp/install to distribution
- Moved and merged all IceGridAdmin.py modules to config.
- Modified build system to deal with new build logic. That is there are
  3 basic ways to find the slice translators and runtime: ICE_HOME, an
  RPM install and the source distribution. Automatically detecting Ice
  in a default install location is now problematic and no longer done.

1 files changed, 9 insertions, 9 deletions

diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py
index f046a964e4a..067bc8a542e 100755
--- a/java/test/Ice/exceptions/run.py
+++ b/java/test/Ice/exceptions/run.py
@@ -10,7 +10,7 @@
 
 import os, sys
 
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
+for toplevel in [".", "..", "../..", "../../..", "../../../..", "../../../../.."]:
     toplevel = os.path.normpath(toplevel)
     if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
         break
@@ -21,20 +21,20 @@ sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
 name = os.path.join("Ice", "exceptions")
-testdir = os.path.join(toplevel, "test", name)
+testdir = os.path.dirname(os.path.abspath(__file__))
 nameAMD = os.path.join("Ice", "exceptionsAMD")
-testdirAMD = os.path.join(toplevel, "test", nameAMD)
+testdirAMD = testdir + "AMD"
 
 print "tests with regular server."
 classpath = os.getenv("CLASSPATH", "")
-os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath
-TestUtil.clientServerTest()
+os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + os.pathsep + classpath
+TestUtil.clientServerTest(name)
 
 print "tests with AMD server."
-TestUtil.clientServerTestWithClasspath(\
-    os.path.join(testdirAMD, "classes") + TestUtil.sep + classpath, \
-    os.path.join(testdir, "classes") + TestUtil.sep + classpath)
+TestUtil.clientServerTestWithClasspath(name,\
+    os.path.join(testdirAMD, "classes") + os.pathsep + classpath, \
+    os.path.join(testdir, "classes") + os.pathsep + classpath)
 
 print "tests with collocated server."
-TestUtil.collocatedTest()
+TestUtil.collocatedTest(name)
 sys.exit(0)