diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-09-17 10:17:54 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-17 10:17:54 +0200 |
commit | 44e2e0e70a84afe351a281b68843e140ddc4fc91 (patch) | |
tree | 0079a3d9061bb5845b6ce8aaa995e710c55df600 /cpp/allTests.py | |
parent | Moved some MX classes to IceInternal (diff) | |
parent | Python support for optionals (diff) | |
download | ice-44e2e0e70a84afe351a281b68843e140ddc4fc91.tar.bz2 ice-44e2e0e70a84afe351a281b68843e140ddc4fc91.tar.xz ice-44e2e0e70a84afe351a281b68843e140ddc4fc91.zip |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
py/python/Ice.py
Diffstat (limited to 'cpp/allTests.py')
-rwxr-xr-x | cpp/allTests.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index 55b94eccb10..340a1772e85 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -44,6 +44,7 @@ tests = [ ("Ice/inheritance", ["core"]), ("Ice/facets", ["core"]), ("Ice/objects", ["core"]), + ("Ice/optional", ["core"]), ("Ice/binding", ["core"]), ("Ice/faultTolerance", ["core", "novalgrind"]), # valgrind reports leak with aborted servers ("Ice/location", ["core"]), |