diff options
| author | Jose <jose@zeroc.com> | 2016-05-11 20:04:01 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-11 20:04:01 +0200 |
| commit | 52fe006e4ad10573b08710e36517f0c4b95a0617 (patch) | |
| tree | d46033709ea755e52f7bb30e44522769e75a0317 | |
| parent | Fix typo "await" CSharp keyword (diff) | |
| download | ice-52fe006e4ad10573b08710e36517f0c4b95a0617.tar.bz2 ice-52fe006e4ad10573b08710e36517f0c4b95a0617.tar.xz ice-52fe006e4ad10573b08710e36517f0c4b95a0617.zip | |
Windows testsuite fixes
| -rw-r--r-- | cpp/test/IceGrid/noRestartUpdate/AllTests.cpp | 6 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/noRestartUpdate/run.py | 5 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp index 6e0f5ebe0b0..95f7ca1a58c 100644 --- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp @@ -527,7 +527,9 @@ allTests(const Ice::CommunicatorPtr& communicator) addProperty(service, "Ice.Warn.UnknownProperties", "0"); //addProperty(service, "Ice.Trace.Admin.Properties", "1"); service->name = "Service1"; - service->entry = properties->getProperty("ServerDir") + "/TestService:create"; + + service->entry = properties->getProperty("ServiceDir") + "/TestService:create"; + adapter = AdapterDescriptor(); adapter.name = "${service}"; adapter.id = "${server}.${service}"; @@ -631,7 +633,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing service update... " << flush; try { - icebox->services[0].descriptor->entry = properties->getProperty("ServerDir") + "/TestService:create2"; + icebox->services[0].descriptor->entry = properties->getProperty("ServiceDir") + "/TestService:create2"; admin->updateApplicationWithoutRestart(update); test(false); } diff --git a/cpp/test/IceGrid/noRestartUpdate/run.py b/cpp/test/IceGrid/noRestartUpdate/run.py index 89ee1ccd21b..89cdc8ad8df 100755 --- a/cpp/test/IceGrid/noRestartUpdate/run.py +++ b/cpp/test/IceGrid/noRestartUpdate/run.py @@ -35,11 +35,10 @@ else: IceGridAdmin.cleanDbDir(node2Dir) -TestUtil.addAdditionalBinDirectories([os.path.join(os.getcwd(), TestUtil.getTestDirectory("testservice"))]) - -nodeOverrideOptions = '--IceBinDir="%s" --ServerDir="%s" --NodePropertiesOverride="%s Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' % ( +nodeOverrideOptions = '--IceBinDir="%s" --ServerDir="%s" --ServiceDir="%s" --NodePropertiesOverride="%s Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' % ( TestUtil.getCppBinDir("cpp"), TestUtil.getTestDirectory("server"), + TestUtil.getTestDirectory("testservice"), TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "")) IceGridAdmin.iceGridTest("", nodeOverrideOptions) diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index c105967412d..50d7646d8fe 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -2548,9 +2548,9 @@ def getTestDirectory(name, baseDir = os.getcwd()): configuration = ("cpp11-" if cpp11 else "") + ("static" if static else "shared") if os.path.isdir(os.path.join(baseDir, buildDir, name)): - return os.path.join(buildDir, name, platform, configuration) + return os.path.join(baseDir, buildDir, name, platform, configuration) else: - return os.path.join(buildDir, platform, configuration) + return os.path.join(baseDir, buildDir, platform, configuration) def getTestExecutable(name, baseDir = os.getcwd()): return os.path.join(getTestDirectory(name, baseDir), name) |