summaryrefslogtreecommitdiff
path: root/cpp/allTests.py
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2008-05-10 10:47:05 +0800
committerMatthew Newhook <matthew@zeroc.com>2008-05-10 10:47:05 +0800
commitfeffc181e3aed97fc84bfdb442cd12abea9a42c7 (patch)
tree96f4b02c3db45c8ec45cd5ea50f2f5a302328768 /cpp/allTests.py
parentfix 64-bit build problem. (diff)
downloadice-feffc181e3aed97fc84bfdb442cd12abea9a42c7.tar.bz2
ice-feffc181e3aed97fc84bfdb442cd12abea9a42c7.tar.xz
ice-feffc181e3aed97fc84bfdb442cd12abea9a42c7.zip
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2848
Squashed commit of the following: commit 60c15b3f794a8e769c07cbc878ec803c2334ac38 Author: Matthew Newhook <matthew@zeroc.com> Date: Sat May 10 10:35:50 2008 +0800 added win32only, novista, nomono tags. commit 133c76a2dfe105a703321a1b431724d80032100b Author: Matthew Newhook <matthew@zeroc.com> Date: Sat May 10 10:20:30 2008 +0800 Revert "Remove Vista paragraph see bug #2848" This reverts commit 96102d5d41fc957c80877333ef5f7482f8c715fd.
Diffstat (limited to 'cpp/allTests.py')
-rwxr-xr-xcpp/allTests.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py
index fefa82f46c2..c8728e97f99 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -24,6 +24,7 @@ import TestUtil
# List of all basic tests.
#
tests = [
+ ("IceUtil/condvar", ["once", "win32only"]),
("IceUtil/thread", ["once"]),
("IceUtil/unicode", ["once"]),
("IceUtil/inputUtil", ["once"]),
@@ -54,7 +55,7 @@ tests = [
("Ice/servantLocator", ["core"]),
("Ice/interceptor", ["core"]),
("Ice/stringConverter", ["core"]),
- ("IceSSL/configuration", ["core"]),
+ ("IceSSL/configuration", ["once"]),
("IceBox/configuration", ["core", "noipv6"]),
("Freeze/dbmap", ["once"]),
("Freeze/complex", ["once"]),
@@ -86,15 +87,5 @@ tests = [
("Glacier2/staticFiltering", ["service", "noipv6"]),
]
-#
-# These tests are currently disabled on cygwin
-#
-if TestUtil.isCygwin() == 0:
- tests += [
- ]
-
-if TestUtil.isWin32():
- tests.insert(0, ("IceUtil/condvar", ["once"]))
-
if __name__ == "__main__":
TestUtil.run(tests)