- 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, 4 insertions, 4 deletions

diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py
index ffc218efb4b..4d13208fb18 100755
--- a/cpp/test/IceGrid/update/run.py
+++ b/cpp/test/IceGrid/update/run.py
@@ -22,7 +22,7 @@ import TestUtil
 import IceGridAdmin
 
 name = os.path.join("IceGrid", "update")
-testdir = os.path.join(toplevel, "test", name)
+testdir = os.path.dirname(os.path.abspath(__file__))
 
 node1Dir = os.path.join(testdir, "db", "node-1")
 if not os.path.exists(node1Dir):
@@ -36,10 +36,10 @@ if not os.path.exists(node2Dir):
 else:
     IceGridAdmin.cleanDbDir(node2Dir)
 
-nodeOverrideOptions = "--IceDir=\"" + toplevel + "\" --TestDir=\"" + testdir + "\"" + \
+nodeOverrideOptions = "--IceDir=\"" + TestUtil.getMappingDir(__file__) + "\" --TestDir=\"" + testdir + "\"" + \
                       ' --NodePropertiesOverride="' + \
-                      TestUtil.clientServerOptions.replace("--", "") + \
+                      TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "") + \
                       ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0' + '"'
 
-IceGridAdmin.iceGridTest(name, "", nodeOverrideOptions)
+IceGridAdmin.iceGridTest(testdir, name, "", nodeOverrideOptions)
 sys.exit(0)