1 files changed, 11 insertions, 6 deletions
diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py
index c53bf8604dc..098974fe19f 100755
--- a/cpp/test/IceGrid/session/run.py
+++ b/cpp/test/IceGrid/session/run.py
@@ -36,8 +36,9 @@ else:
 
 print("Running test with default encoding...")
 
+verifier = os.path.join(os.getcwd(), TestUtil.getTestExecutable("verifier"))
 sys.stdout.write("starting admin permissions verifier... ")
-verifierProc = TestUtil.startServer(os.path.join(os.getcwd(), "verifier"), config=TestUtil.DriverConfig("server"))
+verifierProc = TestUtil.startServer(verifier, config=TestUtil.DriverConfig("server"))
 print("ok")
 
 IceGridAdmin.registryOptions += \
@@ -50,20 +51,24 @@ IceGridAdmin.registryOptions += \
                              r' --IceGrid.Registry.SSLPermissionsVerifier="SSLPermissionsVerifier"' + \
                              r' --IceGrid.Registry.AdminSSLPermissionsVerifier="SSLPermissionsVerifier"'
 
+bindir = TestUtil.getCppBinDir()
+testdir = os.getcwd()
+serverdir = TestUtil.getTestDirectory("server")
+
 IceGridAdmin.iceGridTest("application.xml",
-    '--IceBinDir="%s" --TestDir="%s"' % (TestUtil.getCppBinDir(), os.getcwd()),
-    'properties-override=\'%s\'' % IceGridAdmin.iceGridNodePropertiesOverride())
+    '--IceBinDir="%s" --TestDir="%s" --ServerDir="%s"' % (bindir, testdir, serverdir),
+    'properties-override=\'%s\' server.dir="%s"' % (IceGridAdmin.iceGridNodePropertiesOverride(), serverdir))
 
 verifierProc.waitTestSuccess()
 
 print("Running test with 1.0 encoding...")
 
 sys.stdout.write("starting admin permissions verifier... ")
-verifierProc = TestUtil.startServer(os.path.join(os.getcwd(), "verifier"), config=TestUtil.DriverConfig("server"))
+verifierProc = TestUtil.startServer(verifier, config=TestUtil.DriverConfig("server"))
 print("ok")
 
 IceGridAdmin.iceGridTest("application.xml",
-    '--Ice.Default.EncodingVersion=1.0 --IceBinDir="%s" --TestDir="%s"' % (TestUtil.getCppBinDir(), os.getcwd()),
-    'properties-override=\'%s\'' % IceGridAdmin.iceGridNodePropertiesOverride())
+    '--Ice.Default.EncodingVersion=1.0 --IceBinDir="%s" --TestDir="%s" --ServerDir="%s"' % (bindir, testdir, serverdir),
+    'properties-override=\'%s\' server.dir="%s"' % (IceGridAdmin.iceGridNodePropertiesOverride(), serverdir))
 
 verifierProc.waitTestSuccess()