Changed test suite to work with Mono.

41 files changed, 301 insertions, 180 deletions

diff --git a/cs/allTests.py b/cs/allTests.py
index 85ccffc1f0d..581c232c660 100755
--- a/cs/allTests.py
+++ b/cs/allTests.py
@@ -18,7 +18,10 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-def runTests(tests, num = 0):
+sys.path.append(os.path.join(toplevel, "config"))
+import TestUtil
+
+def runTests(mono, tests, num = 0):
 
     #
     # Run each of the tests.
@@ -34,7 +37,11 @@ def runTests(tests, num = 0):
 	print "*** running tests in " + dir,
 	print
 
-	status = os.system(os.path.join(dir, "run.py"))
+	if mono:
+	    status = os.system(os.path.join(dir, "run.py -m"))
+	else:
+	    status = os.system(os.path.join(dir, "run.py"))
+
 	if status:
 	    if(num > 0):
 		print "[" + str(num) + "]",
@@ -63,22 +70,28 @@ def usage():
     sys.exit(2)
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], "l")
+    opts, args = getopt.getopt(sys.argv[1:], "lm")
 except getopt.GetoptError:
     usage()
 
 if(args):
     usage()
 
-loop = False
+loop = 0
+mono = 0
 for o, a in opts:
     if o == "-l":
-        loop = True
+        loop = 1
+    if o == "-m":
+        mono = 1
     
+if not TestUtil.isWin32():
+    mono = 1
+
 if loop:
     num = 1
-    while True:
-	runTests(tests, num)
+    while 1:
+	runTests(mono, tests, num)
 	num += 1
 else:
-    runTests(tests)
+    runTests(mono, tests)
diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py
index bc4150f4fad..891d76a5889 100644
--- a/cs/config/TestUtil.py
+++ b/cs/config/TestUtil.py
@@ -110,7 +110,7 @@ def getAdapterReady(serverPipe):
 
 def waitServiceReady(pipe, token):
 
-    while True:
+    while 1:
 
         output = pipe.readline().strip()
 
@@ -123,7 +123,7 @@ def waitServiceReady(pipe, token):
 
 def printOutputFromPipe(pipe):
 
-    while True:
+    while 1:
 
         c = pipe.read(1)
 
@@ -185,33 +185,43 @@ serverOptions = serverProtocol + defaultHost + commonServerOptions
 clientServerOptions = clientServerProtocol + defaultHost + commonServerOptions
 collocatedOptions = clientServerProtocol + defaultHost
 
-def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additionalClientOptions, \
+def createMsg(mono, name):
+    
+    msg = "starting "
+    if mono:
+	msg += "mono "
+    msg += name
+    if mono:
+        msg += ".exe"
+    msg += "..."
+
+    return msg
+
+def createCmd(mono, bin):
+
+    if mono:
+        return "mono " + bin + ".exe"
+    else:
+        return bin
+
+def clientServerTestWithOptionsAndNames(mono, name, additionalServerOptions, additionalClientOptions, \
                                         serverName, clientName):
 
-    testDir = os.path.join(toplevel, "test", name)
-    server = os.path.basename(serverName)
-    serverDir = os.path.dirname(os.path.join(testDir, serverName))
-    client = os.path.basename(clientName)
-    clientDir = os.path.dirname(os.path.join(testDir, clientName))
+    testdir = os.path.join(toplevel, "test", name)
+    server = os.path.join(testdir, serverName)
+    client = os.path.join(testdir, clientName)
 
-    cwd = os.getcwd()
-    
-    print "starting " + serverName + "...",
-    os.chdir(serverDir)
-    serverPipe = os.popen(os.path.join(".", server) + serverOptions + " " + additionalServerOptions)
+    print createMsg(mono, serverName),
+
+    serverPipe = os.popen(createCmd(mono, server) + serverOptions + " " + additionalServerOptions)
     getServerPid(serverPipe)
     getAdapterReady(serverPipe)
     print "ok"
     
-    os.chdir(cwd)
-    
-    print "starting " + clientName + "...",
-    os.chdir(clientDir);
-    clientPipe = os.popen(os.path.join(".", client) + clientOptions + " " + additionalClientOptions)
+    print createMsg(mono, clientName),
+    clientPipe = os.popen(createCmd(mono, client) + clientOptions + " " + additionalClientOptions)
     print "ok"
 
-    os.chdir(cwd)
-
     printOutputFromPipe(clientPipe)
 
     clientStatus = clientPipe.close()
@@ -221,38 +231,32 @@ def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additiona
 	killServers()
 	sys.exit(1)
 
-def clientServerTestWithOptions(name, additionalServerOptions, additionalClientOptions):
+def clientServerTestWithOptions(mono, name, additionalServerOptions, additionalClientOptions):
 
-    clientServerTestWithOptionsAndNames(name, additionalServerOptions, additionalClientOptions, "server", "client")
+    clientServerTestWithOptionsAndNames(mono, name, additionalServerOptions, additionalClientOptions, "server", "client")
 
-def clientServerTest(name):
+def clientServerTest(mono, name):
 
-    clientServerTestWithOptions(name, "", "")
+    clientServerTestWithOptions(mono, name, "", "")
 
-def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalClientOptions):
+def mixedClientServerTestWithOptions(mono, name, additionalServerOptions, additionalClientOptions):
 
-    testDir = os.path.join(toplevel, "test", name)
+    testdir = os.path.join(toplevel, "test", name)
+    server = os.path.join(testdir, "server")
+    client = os.path.join(testdir, "client")
 
-    cwd = os.getcwd()
-
-    print "starting server...",
-    os.chdir(testDir);
-    serverPipe = os.popen(os.path.join(".", "server") + clientServerOptions + " " + additionalServerOptions)
+    print createMsg(mono, "server"),
+    serverPipe = os.popen(createCmd(mono, server) + clientServerOptions + " " + additionalServerOptions)
     getServerPid(serverPipe)
     getAdapterReady(serverPipe)
     print "ok"
     
-    os.chdir(cwd)
-
-    print "starting client...",
-    os.chdir(testDir);
-    clientPipe = os.popen(os.path.join(".", "client") + clientServerOptions + " " + additionalClientOptions)
+    print createMsg(mono, "client"),
+    clientPipe = os.popen(createCmd(mono, client) + clientServerOptions + " " + additionalClientOptions)
     getServerPid(clientPipe)
     getAdapterReady(clientPipe)
     print "ok"
 
-    os.chdir(cwd)
-
     printOutputFromPipe(clientPipe)
 
     clientStatus = clientPipe.close()
@@ -262,25 +266,19 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl
 	killServers()
 	sys.exit(1)
 
-def mixedClientServerTest(name):
-
-    mixedClientServerTestWithOptions(name, "", "")
+def mixedClientServerTest(mono, name):
 
-def collocatedTestWithOptions(name, additionalOptions):
+    mixedClientServerTestWithOptions(mono, name, "", "")
 
-    testDir = os.path.join(toplevel, "test", name)
-    collocatedDir = os.path.dirname(os.path.join(testDir, "collocated"))
+def collocatedTestWithOptions(mono, name, additionalOptions):
 
-    cwd = os.getcwd()
+    testdir = os.path.join(toplevel, "test", name)
+    collocated = os.path.join(testdir, "collocated")
 
-    os.chdir(collocatedDir)
-
-    print "starting collocated...",
-    collocatedPipe = os.popen(os.path.join(".", "collocated") + collocatedOptions + " " + additionalOptions)
+    print createMsg(mono, "collocated"),
+    collocatedPipe = os.popen(createCmd(mono, collocated) + collocatedOptions + " " + additionalOptions)
     print "ok"
 
-    os.chdir(cwd)
-
     printOutputFromPipe(collocatedPipe)
 
     collocatedStatus = collocatedPipe.close()
@@ -289,9 +287,9 @@ def collocatedTestWithOptions(name, additionalOptions):
 	killServers()
 	sys.exit(1)
 
-def collocatedTest(name):
+def collocatedTest(mono, name):
 
-    collocatedTestWithOptions(name, "")
+    collocatedTestWithOptions(mono, name, "")
 
 def cleanDbDir(path):
 
diff --git a/cs/test/Ice/adapterDeactivation/client b/cs/test/Ice/adapterDeactivation/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/adapterDeactivation/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/adapterDeactivation/collocated b/cs/test/Ice/adapterDeactivation/collocated
deleted file mode 100755
index e7117459a6f..00000000000
--- a/cs/test/Ice/adapterDeactivation/collocated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono collocated.exe "$@"
diff --git a/cs/test/Ice/adapterDeactivation/run.py b/cs/test/Ice/adapterDeactivation/run.py
index d00bb45d415..4551a345c6a 100755
--- a/cs/test/Ice/adapterDeactivation/run.py
+++ b/cs/test/Ice/adapterDeactivation/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,8 +20,25 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+    
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "adapterDeactivation")
 
-TestUtil.clientServerTest(name)
-TestUtil.collocatedTest(name)
+TestUtil.clientServerTest(mono, name)
+TestUtil.collocatedTest(mono, name)
 sys.exit(0)
diff --git a/cs/test/Ice/adapterDeactivation/server b/cs/test/Ice/adapterDeactivation/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/adapterDeactivation/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/checksum/client/client b/cs/test/Ice/checksum/client/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/checksum/client/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/checksum/run.py b/cs/test/Ice/checksum/run.py
index 0dea017e3f5..6e0dc6e281f 100755
--- a/cs/test/Ice/checksum/run.py
+++ b/cs/test/Ice/checksum/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,8 +20,25 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+    
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "checksum")
 
-TestUtil.clientServerTestWithOptionsAndNames(name, "", "", os.path.join("server", "server"),
+TestUtil.clientServerTestWithOptionsAndNames(mono, name, "", "", os.path.join("server", "server"),
                                              os.path.join("client", "client"))
 sys.exit(0)
diff --git a/cs/test/Ice/checksum/server/server b/cs/test/Ice/checksum/server/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/checksum/server/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/exceptions/client b/cs/test/Ice/exceptions/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/exceptions/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/exceptions/collocated b/cs/test/Ice/exceptions/collocated
deleted file mode 100755
index e7117459a6f..00000000000
--- a/cs/test/Ice/exceptions/collocated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono collocated.exe "$@"
diff --git a/cs/test/Ice/exceptions/run.py b/cs/test/Ice/exceptions/run.py
index 95e734f04dc..d45fcb5be64 100755
--- a/cs/test/Ice/exceptions/run.py
+++ b/cs/test/Ice/exceptions/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,12 +20,29 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+    
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "exceptions")
 
 print "tests with regular server."
-TestUtil.clientServerTestWithOptions(name, "", " --Ice.Warn.Connections=0")
+TestUtil.clientServerTestWithOptions(mono, name, "", " --Ice.Warn.Connections=0")
 print "tests with AMD server."
-TestUtil.clientServerTestWithOptionsAndNames(name, "", "", "serveramd", "client")
+TestUtil.clientServerTestWithOptionsAndNames(mono, name, "", "", "serveramd", "client")
 print "tests with collocated server."
-TestUtil.collocatedTest(name)
+TestUtil.collocatedTest(mono, name)
 sys.exit(0)
diff --git a/cs/test/Ice/exceptions/server b/cs/test/Ice/exceptions/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/exceptions/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/facets/client b/cs/test/Ice/facets/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/facets/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/facets/collocated b/cs/test/Ice/facets/collocated
deleted file mode 100755
index e7117459a6f..00000000000
--- a/cs/test/Ice/facets/collocated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono collocated.exe "$@"
diff --git a/cs/test/Ice/facets/run.py b/cs/test/Ice/facets/run.py
index 5ac24685e78..50553fee6a9 100755
--- a/cs/test/Ice/facets/run.py
+++ b/cs/test/Ice/facets/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,8 +20,25 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+
+if not TestUtil.isWin32():
+    mono = 1
+    
 name = os.path.join("Ice", "facets")
 
-TestUtil.clientServerTest(name)
-TestUtil.collocatedTest(name)
+TestUtil.clientServerTest(mono, name)
+TestUtil.collocatedTest(mono, name)
 sys.exit(0)
diff --git a/cs/test/Ice/facets/server b/cs/test/Ice/facets/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/facets/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/faultTolerance/client b/cs/test/Ice/faultTolerance/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/faultTolerance/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/faultTolerance/run.py b/cs/test/Ice/faultTolerance/run.py
index 4fd10d4a0df..dcee015f257 100755
--- a/cs/test/Ice/faultTolerance/run.py
+++ b/cs/test/Ice/faultTolerance/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,6 +20,23 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+
+if not TestUtil.isWin32():
+    mono = 1
+    
 name = os.path.join("Ice", "faultTolerance")
 testdir = os.path.join(toplevel, "test", name)
 
@@ -31,8 +48,15 @@ base = 12340
 
 serverPipes = { }
 for i in range(0, num):
-    print "starting server #%d..." % (i + 1),
-    serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i))
+    msg = "starting "
+    if mono:
+        msg += "mono "
+    msg += "server"
+    if mono:
+        msg += ".exe"
+    msg += " #%d..." % (i + 1)
+    print msg,
+    serverPipes[i] = os.popen(TestUtil.createCmd(mono, server) + TestUtil.serverOptions + " %d" % (base + i))
     TestUtil.getServerPid(serverPipes[i])
     TestUtil.getAdapterReady(serverPipes[i])
     print "ok"
@@ -41,8 +65,8 @@ ports = ""
 for i in range(0, num):
     ports = "%s %d" % (ports, base + i)
 
-print "starting client...",
-clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports)
+print TestUtil.createMsg(mono, "client"),
+clientPipe = os.popen(TestUtil.createCmd(mono, client) + TestUtil.clientOptions + " " + ports)
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe)
diff --git a/cs/test/Ice/faultTolerance/server b/cs/test/Ice/faultTolerance/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/faultTolerance/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/inheritance/client b/cs/test/Ice/inheritance/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/inheritance/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/inheritance/collocated b/cs/test/Ice/inheritance/collocated
deleted file mode 100755
index e7117459a6f..00000000000
--- a/cs/test/Ice/inheritance/collocated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono collocated.exe "$@"
diff --git a/cs/test/Ice/inheritance/run.py b/cs/test/Ice/inheritance/run.py
index 9e134d09e8a..ebd7da9727f 100755
--- a/cs/test/Ice/inheritance/run.py
+++ b/cs/test/Ice/inheritance/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,8 +20,25 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "inheritance")
 
-TestUtil.clientServerTest(name)
-TestUtil.collocatedTest(name)
+TestUtil.clientServerTest(mono, name)
+TestUtil.collocatedTest(mono, name)
 sys.exit(0)
diff --git a/cs/test/Ice/inheritance/server b/cs/test/Ice/inheritance/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/inheritance/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/location/client b/cs/test/Ice/location/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/location/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/location/run.py b/cs/test/Ice/location/run.py
index f35b02a6499..e86d47d0875 100755
--- a/cs/test/Ice/location/run.py
+++ b/cs/test/Ice/location/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,7 +20,24 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "location")
 
-TestUtil.mixedClientServerTest(name)
+TestUtil.mixedClientServerTest(mono, name)
 sys.exit(0)
diff --git a/cs/test/Ice/location/server b/cs/test/Ice/location/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/location/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/objects/client b/cs/test/Ice/objects/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/objects/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/objects/collocated b/cs/test/Ice/objects/collocated
deleted file mode 100755
index e7117459a6f..00000000000
--- a/cs/test/Ice/objects/collocated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono collocated.exe "$@"
diff --git a/cs/test/Ice/objects/run.py b/cs/test/Ice/objects/run.py
index 9003cf1dd63..226f4fe112c 100755
--- a/cs/test/Ice/objects/run.py
+++ b/cs/test/Ice/objects/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,8 +20,25 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "objects")
 
-TestUtil.clientServerTest(name)
-TestUtil.collocatedTest(name)
+TestUtil.clientServerTest(mono, name)
+TestUtil.collocatedTest(mono, name)
 sys.exit(0)
diff --git a/cs/test/Ice/objects/server b/cs/test/Ice/objects/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/objects/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/operations/client b/cs/test/Ice/operations/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/operations/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/operations/collocated b/cs/test/Ice/operations/collocated
deleted file mode 100755
index e7117459a6f..00000000000
--- a/cs/test/Ice/operations/collocated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono collocated.exe "$@"
diff --git a/cs/test/Ice/operations/run.py b/cs/test/Ice/operations/run.py
index c75c6ae20d2..174d0eef877 100755
--- a/cs/test/Ice/operations/run.py
+++ b/cs/test/Ice/operations/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,12 +20,29 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "operations")
 
 print "tests with regular server."
-TestUtil.clientServerTest(name)
+TestUtil.clientServerTest(mono, name)
 print "tests with AMD server."
-TestUtil.clientServerTestWithOptionsAndNames(name, "", "", "serveramd", "client")
+TestUtil.clientServerTestWithOptionsAndNames(mono, name, "", "", "serveramd", "client")
 print "tests with collocated server."
-TestUtil.collocatedTest(name)
+TestUtil.collocatedTest(mono, name)
 sys.exit(0)
diff --git a/cs/test/Ice/operations/server b/cs/test/Ice/operations/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/operations/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/operations/serveramd b/cs/test/Ice/operations/serveramd
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/operations/serveramd
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/slicing/exceptions/client b/cs/test/Ice/slicing/exceptions/client
deleted file mode 100755
index 10c45138445..00000000000
--- a/cs/test/Ice/slicing/exceptions/client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono client.exe "$@"
diff --git a/cs/test/Ice/slicing/exceptions/run.py b/cs/test/Ice/slicing/exceptions/run.py
index d3ba673ed15..7db7cda2e11 100755
--- a/cs/test/Ice/slicing/exceptions/run.py
+++ b/cs/test/Ice/slicing/exceptions/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,10 +20,27 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "slicing", "exceptions")
 
 print "tests with regular server."
-TestUtil.clientServerTest(name)
+TestUtil.clientServerTest(mono, name)
 print "tests with AMD server."
-TestUtil.clientServerTestWithOptionsAndNames(name, "", "", "serveramd", "client")
+TestUtil.clientServerTestWithOptionsAndNames(mono, name, "", "", "serveramd", "client")
 sys.exit(0)
diff --git a/cs/test/Ice/slicing/exceptions/server b/cs/test/Ice/slicing/exceptions/server
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/slicing/exceptions/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/slicing/exceptions/serveramd b/cs/test/Ice/slicing/exceptions/serveramd
deleted file mode 100755
index ed5da3aede3..00000000000
--- a/cs/test/Ice/slicing/exceptions/serveramd
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono server.exe "$@"
diff --git a/cs/test/Ice/slicing/objects/run.py b/cs/test/Ice/slicing/objects/run.py
index 8b778b11ec1..0c2c5b36268 100755
--- a/cs/test/Ice/slicing/objects/run.py
+++ b/cs/test/Ice/slicing/objects/run.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import os, sys
+import os, sys, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -20,10 +20,27 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
+def usage():
+    print "usage: " + sys.argv[0] + " [-m]"
+    sys.exit(2)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "m")
+except getopt.GetoptError:
+    usage()
+
+mono = 0
+for o, a in opts:
+    if o == "-m":
+        mono = 1
+
+if not TestUtil.isWin32():
+    mono = 1
+
 name = os.path.join("Ice", "slicing", "objects")
 
 print "tests with regular server."
-TestUtil.clientServerTest(name)
+TestUtil.clientServerTest(mono, name)
 print "tests with AMD server."
-TestUtil.clientServerTestWithOptionsAndNames(name, "", "", "serveramd", "client")
+TestUtil.clientServerTestWithOptionsAndNames(mono, name, "", "", "serveramd", "client")
 sys.exit(0)