diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf | 4 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/EC_Throughput/run_test.pl | 9 |
3 files changed, 17 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b024beec87e..c2892a979bc 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Fri Mar 16 13:53:04 2001 Carlos O'Ryan <coryan@uci.edu> + + * orbsvcs/tests/EC_Throughput/run_test.pl: + Made several cosmetic fixes, but also re-enabled the ec_mt.conf + file test. It works for me on my workspace, can't tell why it + fails in the nightly builds yet. + + * orbsvcs/tests/EC_Throughput/ec_mt.conf: + Minor cosmetic fixes. + Fri Mar 16 14:10:25 2001 Nanbor Wang <nanbor@cs.wustl.edu> * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile: diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf b/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf index 02c971a7150..f0b21964ce3 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf +++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf @@ -1,2 +1,4 @@ +# # $Id$ -static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECdispatching mt -ECdispatchingthreads 4 -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier" +# +static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier" diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index 049a06682f3..67a55e82d55 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -11,13 +11,12 @@ use PerlACE::Run_Test; $status = 0; $ec_conf = PerlACE::LocalFile ("ec.conf"); -#$ec_mt_conf = PerlACE::LocalFile ("ec_mt.conf"); -$ec_mt_conf = PerlACE::LocalFile (""); +$ec_mt_conf = PerlACE::LocalFile ("ec_mt.conf"); print STDERR "================ Collocated tests, single threaded\n"; $T = new PerlACE::Process ("ECT_Throughput", - "-ORBsvcconf $ec_conf" + "-ORBSvcConf $ec_conf" . " -m new -u 10000 -n 1 -t 0 -c 4"); @@ -28,10 +27,10 @@ if ($test != 0) { $status = 1; } -print STDERR "================ Collocated tests, single threaded\n"; +print STDERR "================ Collocated tests, multi threaded\n"; $T = new PerlACE::Process ("ECT_Throughput", - "-ORBsvcconf $ec_mt_conf" + "-ORBSvcConf $ec_mt_conf" . "-m new -u 10000 -n 1 -t 0 -c 4"); $test = $T->SpawnWaitKill (60); |