summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-11-29 19:04:33 +0000
committermcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-11-29 19:04:33 +0000
commita8b119c8c16274fefb3d0949f6ec4c286a7249fd (patch)
treec1c35e4f5a73f95e247e542d4b2c59bd72636f27
parentb56ffd06aa9076a678206573f844444bd2b52736 (diff)
downloadATCD-a8b119c8c16274fefb3d0949f6ec4c286a7249fd.tar.gz
Mon Nov 29 19:02:18 UTC 2010 Martin Corino <corino_m@remedy.nl>
* tests/Abstract_Interface/client.cpp: Fixed test so now it really runs the null-test part.
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tests/Abstract_Interface/client.cpp1
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f64ffc47545..95c4dbc4b5a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 29 19:02:18 UTC 2010 Martin Corino <corino_m@remedy.nl>
+
+ * tests/Abstract_Interface/client.cpp:
+ Fixed test so now it really runs the null-test part.
+
Mon Nov 29 17:11:52 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/be/be_visitor_array.cpp:
@@ -26,6 +31,7 @@ Mon Nov 29 15:26:46 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
Removed unused local variables.
+>>>>>>> .r92751
Fri Nov 26 22:30:25 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp:
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index 9e489effe51..f9ce8e86e83 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -277,7 +277,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
if (which_test == TEST_EXCEPTION || which_test == TEST_ALL)
{
- which_test = TEST_EXCEPTION;
test_exception (package.in ());
}