ChangeLogTag: Tue Jun 24 18:40:08 2003 Pradeep Gore <pradeep@oomworks.com>

6 files changed, 30 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 808e73d7ebb..0b6e396b9f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 24 18:38:33 2003  Pradeep Gore  <pradeep@oomworks.com>
+
+	* bin/tao_other_tests.lst:
+	  Added Notify Basic test for RT_Notification.
+	  Moved the Notify Lanes and Threadpool test with the other
+	  Notify tests.
+
 Tue Jun 24 15:47:16 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* bin/MakeProjectCreator/config/ciao_client.mpb: Added
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index af4bc45b79f..508e9670d66 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Jun 24 18:40:08 2003  Pradeep Gore  <pradeep@oomworks.com>
+
+	* orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl:
+	  uncommented code that should have been enabled.
+
+	* orbsvcs/tests/Notify/Basic/run_test.pl:
+	  Added build option for RT Notification.
+
+	* orbsvcs/tests/Notify/Basic/notify.rt.conf:  
+	  Conf file for RT Notification.
+
 Tue June 24 16:26:06 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
 	* orbsvcs/orbsvcs/AV/AV_Core.cpp: Check if the peer address is
diff --git a/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf b/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
new file mode 100644
index 00000000000..26e9015628c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
@@ -0,0 +1,2 @@
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
index 3a56464b968..a0f5568f540 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -60,6 +60,7 @@ $status = 0;
 
 @default_test_configs =
   (
+   "notify.rt.conf",
    "notify.reactive.conf",
    "notify.mt.conf",
    );
@@ -109,7 +110,7 @@ for $config (@test_configs)
         ## configuration, so we skip this test for now.
         ## The Notification should actually throw an exception for the property not supported.
         if ($name->{name} eq "AdminProperties" 
-            && $config eq "notify.reactive.conf")
+            && ($config eq "notify.reactive.conf" || $config eq "notify.rt.conf"))
           {
             next;
           }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
index cc309f8f595..faa104133ca 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
@@ -19,8 +19,8 @@ if ($opt_h)
     exit 0;
 }
 
-$experiment_timeout = 600;
-$startup_timeout = 600;
+$experiment_timeout = 240;
+$startup_timeout = 120;
 
 if ($opt_n)
 {
@@ -74,7 +74,7 @@ $Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_io
 
 $Supplier = new PerlACE::Process ("../../../Driver/Notify_Tests_Driver");
 
-#$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
 
 #$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf -ORBDebugLevel 1";
 
diff --git a/bin/tao_other_tests.lst b/bin/tao_other_tests.lst
index b6fe17b0120..512e2b65a82 100644
--- a/bin/tao_other_tests.lst
+++ b/bin/tao_other_tests.lst
@@ -72,8 +72,9 @@ TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !STATIC
 TAO/orbsvcs/tests/ImplRepo/run_test.pl: SANDBOX
 TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: SANDBOX
 TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf !ST
 TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !MINIMUM
 TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST
 TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST
 TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST
@@ -84,6 +85,8 @@ TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST
 TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST
 TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST
 TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST
+TAO/orbsvcs/tests/Notify/Lanes/run_test.pl: !ST !MINIMUM
+TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl: !ST !MINIMUM
 # BREAKS !linux 'TAO/orbsvcs/tests/EC_Mcast/run_test.pl
 # FAILS 'TAO/orbsvcs/tests/EC_Multiple/run_test.pl
 # NO REDIRECTION TAO/examples/Simple/echo/run_test.pl < Echo.idl
@@ -102,5 +105,4 @@ TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !STATIC !SUNCC5_1
 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Two_Objects/run_test.pl: !ST
 TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/Notify/Lanes/run_test.pl: !ST !Linux
-TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl: !ST !Linux
+