summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rwxr-xr-xcpp/test/Freeze/dbmap/run.py1
-rwxr-xr-xcpp/test/Freeze/evictor/run.py1
-rwxr-xr-xcpp/test/Glacier/starter/run.py1
-rwxr-xr-xcpp/test/Ice/faultTolerance/run.py4
-rwxr-xr-xcpp/test/Ice/locationForward/run.py4
-rwxr-xr-xcpp/test/IcePack/deployer/run.py3
-rwxr-xr-xcpp/test/IcePack/simple/run.py10
-rwxr-xr-xcpp/test/IceSSL/certificateAndKeyParsing/run.py4
-rwxr-xr-xcpp/test/IceSSL/certificateVerification/run.py1
-rwxr-xr-xcpp/test/IceSSL/certificateVerifier/run.py4
-rwxr-xr-xcpp/test/IceSSL/configuration/run.py4
-rwxr-xr-xcpp/test/IceSSL/loadPEM/run.py4
-rwxr-xr-xcpp/test/IceStorm/federation2/run.py4
-rwxr-xr-xcpp/test/IceXML/encoding/run.py1
-rwxr-xr-xcpp/test/XMLTransform/transform/run.py1
-rwxr-xr-xcpp/test/Yellow/basicYellow/run.py1
16 files changed, 30 insertions, 18 deletions
diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py
index cadf11108e0..159a7d53fe6 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -26,7 +26,6 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
name = os.path.join("Freeze", "dbmap")
-
testdir = os.path.join(toplevel, "test", name)
dbdir = os.path.join(testdir, "db")
diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py
index cc0f3522482..dbf53a2336e 100755
--- a/cpp/test/Freeze/evictor/run.py
+++ b/cpp/test/Freeze/evictor/run.py
@@ -26,7 +26,6 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
name = os.path.join("Freeze", "evictor")
-
testdir = os.path.join(toplevel, "test", name)
dbdir = os.path.join(testdir, "db")
diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py
index 972037e45ec..bb806396c59 100755
--- a/cpp/test/Glacier/starter/run.py
+++ b/cpp/test/Glacier/starter/run.py
@@ -44,6 +44,7 @@ TestUtil.getAdapterReady(starterPipe)
print "ok"
name = os.path.join("Glacier", "starter")
+
TestUtil.mixedClientServerTest(name)
# We run the test again, to check whether the glacier router starter
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index e06b110f939..07e4792ff76 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -25,7 +25,9 @@ else:
sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
-testdir = os.path.join(toplevel,"test", "Ice", "faultTolerance")
+name = os.path.join("Ice", "faultTolerance")
+testdir = os.path.join(toplevel, "test", name)
+
server = os.path.join(testdir, "server")
client = os.path.join(testdir, "client")
diff --git a/cpp/test/Ice/locationForward/run.py b/cpp/test/Ice/locationForward/run.py
index 2fba1589028..722cc7dbc5e 100755
--- a/cpp/test/Ice/locationForward/run.py
+++ b/cpp/test/Ice/locationForward/run.py
@@ -25,7 +25,9 @@ else:
sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
-testdir = os.path.join(toplevel, "test", "Ice", "locationForward")
+name = os.path.join("Ice", "locationForward")
+testdir = os.path.join(toplevel, "test", name)
+
server = os.path.join(testdir, "server")
client = os.path.join(testdir, "client")
diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py
index 5c510903f3a..124b7e95d13 100755
--- a/cpp/test/IcePack/deployer/run.py
+++ b/cpp/test/IcePack/deployer/run.py
@@ -26,7 +26,8 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
import IcePackAdmin
-testdir = os.path.join(toplevel, "test", "IcePack", "deployer")
+name = os.path.join("IcePack", "deployer")
+testdir = os.path.join(toplevel, "test", name)
if not TestUtil.isWin32():
os.environ["LD_LIBRARY_PATH"] = testdir + ":" + os.environ["LD_LIBRARY_PATH"]
diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py
index 533d38b7302..cfabc708cda 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/run.py
@@ -27,7 +27,7 @@ import TestUtil
import IcePackAdmin
name = os.path.join("IcePack", "simple")
-testdir = os.path.join(toplevel, "test", "IcePack", "simple")
+testdir = os.path.join(toplevel, "test", name)
#
# Add locator options for the client and server. Since the server
@@ -38,7 +38,7 @@ additionalOptions = " --Ice.Default.Locator=\"IcePack/Locator:default -p 12346\"
IcePackAdmin.cleanDbDir(os.path.join(testdir, "db"))
#
-# Start IcePack registry
+# Start IcePack registry.
#
icePackRegistryPipe = IcePackAdmin.startIcePackRegistry("12346", testdir)
@@ -56,7 +56,7 @@ IcePackAdmin.shutdownIcePackRegistry(icePackRegistryPipe)
IcePackAdmin.cleanDbDir(os.path.join(testdir, "db"))
#
-# Start the registry and a node.
+# Start IcePack registry and a node.
#
icePackRegistryPipe = IcePackAdmin.startIcePackRegistry("12346", testdir)
icePackNodePipe = IcePackAdmin.startIcePackNode(testdir)
@@ -71,10 +71,8 @@ print "registering server with icepack...",
IcePackAdmin.addServer("server", os.path.join(testdir, "simple_server.xml"), server, "", "");
print "ok"
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) + additionalOptions
-
print "starting client...",
-clientPipe = os.popen(client + updatedClientOptions)
+clientPipe = os.popen(client + TestUtil.clientOptions + additionalOptions)
print "ok"
for output in clientPipe.xreadlines():
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
index 20e03a10b88..1680f62256f 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
@@ -35,7 +35,9 @@ testOptions = " --IceSSL.Test.Client.CertPath=" + os.path.join(toplevel, "test",
" --IceSSL.Server.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
" --IceSSL.Server.Config= "
-testdir = os.path.join(toplevel,"test", "IceSSL", "certificateAndKeyParsing")
+name = os.path.join("IceSSL", "certificateAndKeyParsing")
+testdir = os.path.join(toplevel, "test", name)
+
client = os.path.join(testdir, "certificateAndKeyParsing")
localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
diff --git a/cpp/test/IceSSL/certificateVerification/run.py b/cpp/test/IceSSL/certificateVerification/run.py
index 9038b280d80..4820bc86503 100755
--- a/cpp/test/IceSSL/certificateVerification/run.py
+++ b/cpp/test/IceSSL/certificateVerification/run.py
@@ -44,6 +44,7 @@ TestUtil.clientServerOptions += " --IceSSL.Test.Client.CertPath=" + \
os.path.join(toplevel, "test", "IceSSL", "certs")
name = os.path.join("IceSSL", "certificateVerification")
+testdir = os.path.join(toplevel, "test", name)
print "testing default certificate verifier."
TestUtil.clientServerTest(name)
diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py
index 84f28dab0ff..82ef9d81a1d 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/run.py
@@ -29,7 +29,9 @@ if TestUtil.protocol != "ssl":
print "This test may only be run with SSL enabled."
sys.exit(0)
-testdir = os.path.join(toplevel,"test", "IceSSL", "certificateVerifier")
+name = os.path.join("IceSSL", "certificateVerifier")
+testdir = os.path.join(toplevel, "test", name)
+
client = os.path.join(testdir, "certificateVerifier")
localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index fcfa47e4f51..54e3e2362cc 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -29,7 +29,9 @@ if TestUtil.protocol != "ssl":
print "This test may only be run with SSL enabled."
sys.exit(0)
-testdir = os.path.join(toplevel,"test", "IceSSL", "configuration")
+name = os.path.join("IceSSL", "configuration")
+testdir = os.path.join(toplevel, "test", name)
+
client = os.path.join(testdir, "configuration")
localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py
index 1b289b4ee48..a391851d784 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/run.py
@@ -34,7 +34,9 @@ testOptions = " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "test", "Ice
" --IceSSL.Server.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
" --IceSSL.Server.Config= "
-testdir = os.path.join(toplevel,"test", "IceSSL", "loadPEM")
+name = os.path.join("IceSSL", "loadPEM")
+testdir = os.path.join(toplevel, "test", name)
+
client = os.path.join(testdir, "loadPEM")
localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 019696da00b..a736b13a45a 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -25,7 +25,9 @@ else:
sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
-testdir = os.path.join(toplevel, "test", "IceStorm", "federation2")
+name = os.path.join("IceStorm", "federation2")
+testdir = os.path.join(toplevel, "test", name)
+
exedir = os.path.join(toplevel, "test", "IceStorm", "federation")
iceBox = os.path.join(toplevel, "bin", "icebox")
diff --git a/cpp/test/IceXML/encoding/run.py b/cpp/test/IceXML/encoding/run.py
index bedb99983ce..51a630de65c 100755
--- a/cpp/test/IceXML/encoding/run.py
+++ b/cpp/test/IceXML/encoding/run.py
@@ -26,7 +26,6 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
name = os.path.join("IceXML", "encoding")
-
testdir = os.path.join(toplevel, "test", name)
client = os.path.join(testdir, "client")
diff --git a/cpp/test/XMLTransform/transform/run.py b/cpp/test/XMLTransform/transform/run.py
index 1ef1cb30895..1aadcf70adc 100755
--- a/cpp/test/XMLTransform/transform/run.py
+++ b/cpp/test/XMLTransform/transform/run.py
@@ -26,7 +26,6 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
name = os.path.join("XMLTransform", "transform")
-
testdir = os.path.join(toplevel, "test", name)
dbdir = os.path.join(testdir, "db")
diff --git a/cpp/test/Yellow/basicYellow/run.py b/cpp/test/Yellow/basicYellow/run.py
index 5ab900e2eb2..0357852c4b9 100755
--- a/cpp/test/Yellow/basicYellow/run.py
+++ b/cpp/test/Yellow/basicYellow/run.py
@@ -48,6 +48,7 @@ TestUtil.waitServiceReady(IceBoxPipe, "Yellow")
print "ok"
client = os.path.join(testdir, "client")
+
#
# Start the client.
#
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:42:16 +0000