diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/IceGrid/session/AllTests.cpp | 4 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/session/run.py | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/update/AllTests.cpp | 4 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/update/run.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 7552569787b..2652ec2be6b 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -1640,7 +1640,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // nodeApp.name = "NodeApp"; // ServerDescriptorPtr server = new ServerDescriptor(); // server->id = "node-1"; -// server->exe = properties->getProperty("IceDir") + "/bin/icegridnode"; +// server->exe = properties->getProperty("IceBinDir") + "/icegridnode"; // server->options.push_back("--nowarn"); // server->pwd = "."; // addProperty(server, "IceGrid.Node.Name", "node-1"); @@ -1765,7 +1765,7 @@ allTests(const Ice::CommunicatorPtr& communicator) nodeApp.name = "NodeApp"; ServerDescriptorPtr server = new ServerDescriptor(); server->id = "node-1"; - server->exe = properties->getProperty("IceDir") + "/bin/icegridnode"; + server->exe = properties->getProperty("IceBinDir") + "/icegridnode"; server->options.push_back("--nowarn"); server->pwd = "."; addProperty(server, "IceGrid.Node.Name", "node-1"); diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index 77e75df725f..540c86f7294 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/run.py @@ -52,7 +52,7 @@ IceGridAdmin.registryOptions += \ r' --IceGrid.Registry.SSLPermissionsVerifier="SSLPermissionsVerifier"' IceGridAdmin.iceGridTest(testdir, name, "application.xml", \ - "--IceDir=\"" + TestUtil.getIceDir("cpp") + "\" --TestDir=\"" + testdir + "\"", \ + "--IceBinDir=\"" + TestUtil.getCppBinDir() + "\" --TestDir=\"" + testdir + "\"", \ '\\"properties-override=' + \ TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "") + '\\"') diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp index c313fd530a7..ae842d7a6a1 100644 --- a/cpp/test/IceGrid/update/AllTests.cpp +++ b/cpp/test/IceGrid/update/AllTests.cpp @@ -596,7 +596,7 @@ allTests(const Ice::CommunicatorPtr& communicator) IceBoxDescriptorPtr server = new IceBoxDescriptor(); server->id = "IceBox"; - server->exe = properties->getProperty("IceDir") + "/bin/icebox"; + server->exe = properties->getProperty("IceBinDir") + "/icebox"; addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); server->services.resize(3); server->services[0].descriptor = ServiceDescriptorPtr::dynamicCast(service->ice_clone()); @@ -1136,7 +1136,7 @@ allTests(const Ice::CommunicatorPtr& communicator) ServerDescriptorPtr server = new ServerDescriptor(); server->id = "node-${index}"; - server->exe = properties->getProperty("IceDir") + "/bin/icegridnode"; + server->exe = properties->getProperty("IceBinDir") + "/icegridnode"; server->pwd = "."; server->options.push_back("--nowarn"); diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py index 4ca99cbaf5b..72d34fe748b 100755 --- a/cpp/test/IceGrid/update/run.py +++ b/cpp/test/IceGrid/update/run.py @@ -37,7 +37,7 @@ if not os.path.exists(node2Dir): else: IceGridAdmin.cleanDbDir(node2Dir) -nodeOverrideOptions = "--IceDir=\"" + TestUtil.getIceDir("cpp") + "\" --TestDir=\"" + testdir + "\"" + \ +nodeOverrideOptions = "--IceBinDir=\"" + TestUtil.getCppBinDir() + "\" --TestDir=\"" + testdir + "\"" + \ ' --NodePropertiesOverride="' + \ TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "") + \ ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0' + '"' |