summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcorino <mcorino@users.noreply.github.com>2009-12-09 12:45:25 +0000
committermcorino <mcorino@users.noreply.github.com>2009-12-09 12:45:25 +0000
commite5d1c189ab65bab4f3e56d97ca89c175fd68f5a3 (patch)
treec8ed9f8f8576aaa3a077017deaab7059aab19896
parentf283fbd8f4b01d450702828b4e54916fac2342f9 (diff)
downloadATCD-e5d1c189ab65bab4f3e56d97ca89c175fd68f5a3.tar.gz
Wed Dec 9 12:45:58 UTC 2009 Martin Corino <mcorino@remedy.nl>
* tests/OBV/Supports/Supports_Test.mpc: Removed dummy_label dependency. * tests/OBV/Supports/client.cpp: Fixed small coding error. * bin/tao_orb_tests.lst: Reenabled the OBV/Supports test again since the reason for excluding this one seems to have been invalidated (long ago?).
-rw-r--r--TAO/ChangeLog12
-rw-r--r--TAO/bin/tao_orb_tests.lst1
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test.mpc6
-rw-r--r--TAO/tests/OBV/Supports/client.cpp4
4 files changed, 15 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0f5ae86eaf1..af214f62c62 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed Dec 9 12:45:58 UTC 2009 Martin Corino <mcorino@remedy.nl>
+
+ * tests/OBV/Supports/Supports_Test.mpc:
+ Removed dummy_label dependency.
+
+ * tests/OBV/Supports/client.cpp:
+ Fixed small coding error.
+
+ * bin/tao_orb_tests.lst:
+ Reenabled the OBV/Supports test again since the reason for
+ excluding this one seems to have been invalidated (long ago?).
+
Wed Dec 9 12:31:58 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com>
* tests/Bug_1361_Regression/Server_Thread_Pool.h:
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index 563fb8f080a..6a91d33a930 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -203,6 +203,7 @@ TAO/tests/OBV/Factory/run_test.pl: !CORBA_E_MICRO
TAO/tests/OBV/Forward/run_test.pl: !CORBA_E_MICRO
TAO/tests/OBV/Indirection/run_test.pl: !CORBA_E_MICRO
TAO/tests/OBV/Simple/run_test.pl: !CORBA_E_MICRO
+TAO/tests/OBV/Supports/run_test.pl: !CORBA_E_MICRO
TAO/tests/OBV/TC_Alignment/run_test.pl: !CORBA_E_MICRO
TAO/tests/OBV/Truncatable/run_test.pl: !CORBA_E_MICRO
TAO/tests/OBV/ValueBox/run_test.pl: !CORBA_E_MICRO
diff --git a/TAO/tests/OBV/Supports/Supports_Test.mpc b/TAO/tests/OBV/Supports/Supports_Test.mpc
index 7d9df51c0b7..e3cc9e032e8 100644
--- a/TAO/tests/OBV/Supports/Supports_Test.mpc
+++ b/TAO/tests/OBV/Supports/Supports_Test.mpc
@@ -1,9 +1,6 @@
// $Id$
project(*Server): taoserver, valuetype, strategies {
- // This is just a dummy_label to prevent the test from being compiled
- // in MPC builds
- requires += dummy_label
Source_Files {
server.cpp
Supports_Test_impl.cpp
@@ -20,9 +17,6 @@ project(*Server): taoserver, valuetype, strategies {
project(*Client): taoclient, taoserver, valuetype {
exename = client
after += *Server
- // This is just a dummy_label to prevent the test from being compiled
- // in MPC builds
- requires += dummy_label
Source_Files {
client.cpp
Supports_Test_impl.cpp
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index fa25ce91169..2e77f6911e2 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -16,11 +16,11 @@ parse_args (int argc, ACE_TCHAR *argv[])
switch (c)
{
case 't':
- num_trials = ACE_OS::atoi (get_opts.opt_arg);
+ num_trials = ACE_OS::atoi (get_opts.opt_arg ());
break;
case 'i':
- id = ACE_OS::atoi (get_opts.opt_arg);
+ id = ACE_OS::atoi (get_opts.opt_arg ());
break;
case 'k':