summaryrefslogtreecommitdiff
path: root/php/test
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2009-12-11 13:53:15 -0800
committerMark Spruiell <mes@zeroc.com>2009-12-11 13:53:15 -0800
commitfe15675f87e3bf3976ea17d0e624c6effdebe5d7 (patch)
tree2bf6eb22997cf808b95762866ad777f68c11b66b /php/test
parenttypo. (diff)
downloadice-fe15675f87e3bf3976ea17d0e624c6effdebe5d7.tar.bz2
ice-fe15675f87e3bf3976ea17d0e624c6effdebe5d7.tar.xz
ice-fe15675f87e3bf3976ea17d0e624c6effdebe5d7.zip
more PHP fixes
Diffstat (limited to 'php/test')
-rw-r--r--php/test/Ice/objects/Client.php16
1 files changed, 13 insertions, 3 deletions
diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php
index d4c3f76d524..c86a8af8542 100644
--- a/php/test/Ice/objects/Client.php
+++ b/php/test/Ice/objects/Client.php
@@ -369,12 +369,22 @@ function allTests($communicator)
catch(Exception $ex)
{
$uoe = $NS ? "Ice\\UnexpectedObjectException" : "Ice_UnexpectedObjectException";
- if(!($ex instanceof $uoe))
+ $uoob = $NS ? "Ice\\UnmarshalOutOfBoundsException" : "Ice_UnmarshalOutOfBoundsException";
+ if($ex instanceof $uoe)
+ {
+ test($ex->type == "::Test::AlsoEmpty");
+ test($ex->expectedType == "::Test::Empty");
+ }
+ else if($ex instanceof $uoob)
+ {
+ //
+ // We get UnmarshalOutOfBoundsException on Windows with VC6.
+ //
+ }
+ else
{
throw $ex;
}
- test($ex->type == "::Test::AlsoEmpty");
- test($ex->expectedType == "::Test::Empty");
}
echo "ok\n";