diff options
Diffstat (limited to 'cpp/test/IceGrid/deployer/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/deployer/run.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py index aa982ac2c6f..a1ea4e587eb 100755 --- a/cpp/test/IceGrid/deployer/run.py +++ b/cpp/test/IceGrid/deployer/run.py @@ -20,9 +20,13 @@ if len(path) == 0: sys.path.append(os.path.join(path[0], "scripts")) import TestUtil, IceGridAdmin +TestUtil.addAdditionalBinDirectories([os.path.join(os.getcwd(), TestUtil.getTestDirectory("testservice"))]) +serverDir = os.path.join(os.getcwd(), TestUtil.getTestDirectory("server")) os.environ["MY_FOO"] = "12" -IceGridAdmin.iceGridTest("application.xml", '--TestDir="%s"' % os.getcwd(), "icebox.exe='%s'" % TestUtil.getIceBox()) +IceGridAdmin.iceGridTest("application.xml", '--TestDir="%s"' % serverDir, ("icebox.exe='%s' server.dir='%s'" % + (TestUtil.getIceBox(), serverDir))) # Tests with targets -IceGridAdmin.iceGridTest("application.xml", '-t --TestDir="%s"' % os.getcwd(), - "icebox.exe='%s' moreservers moreservices moreproperties" % TestUtil.getIceBox()) +IceGridAdmin.iceGridTest("application.xml", '-t --TestDir="%s"' % serverDir, + ("icebox.exe='%s' server.dir='%s' moreservers moreservices moreproperties" % + (TestUtil.getIceBox(), serverDir))) |