summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-03-17 14:42:29 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-03-17 14:42:29 +0000
commit95dbc2d83f5c6315f01d65769088faf9fe6dc7c2 (patch)
tree6f69a1747306e5f5a56e2a3e873f3e25e005daef
parentf69c269c27e87ca41f2a0e7607541349c35ad1e1 (diff)
downloadATCD-95dbc2d83f5c6315f01d65769088faf9fe6dc7c2.tar.gz
Merged revisions 80957,80963 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE ........ r80957 | johnnyw | 2008-03-17 04:08:00 -0500 (Mon, 17 Mar 2008) | 1 line Mon Mar 14 09:07:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r80963 | johnnyw | 2008-03-17 04:20:16 -0500 (Mon, 17 Mar 2008) | 1 line Mon Mar 14 09:17:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........
-rw-r--r--ACE/ChangeLog10
-rw-r--r--ACE/bin/tao_orb_tests.lst1
-rw-r--r--ACE/bin/tao_other_tests.lst1
3 files changed, 12 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 0e93ce102a4..89962a98748 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,13 @@
+Mon Mar 14 09:17:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/tao_other_tests.lst:
+ Added 3252
+
+Mon Mar 14 09:07:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/tao_orb_tests.lst:
+ Added 3251
+
Fri Mar 14 19:57:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_aix_g++.GNU:
diff --git a/ACE/bin/tao_orb_tests.lst b/ACE/bin/tao_orb_tests.lst
index b0cfc20890c..a12c6b8aa42 100644
--- a/ACE/bin/tao_orb_tests.lst
+++ b/ACE/bin/tao_orb_tests.lst
@@ -119,6 +119,7 @@ TAO/tests/Bug_3154_Regression/run_test.pl: !NO_IFR !LabVIEW_RT
TAO/tests/Bug_3163_Regression/run_test.pl: !LabVIEW_RT
TAO/tests/Bug_3171_Regression/run_test.pl: !ST !MINIMUM !NO_MESSAGING !LabVIEW_RT
TAO/tests/Bug_3198_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LabVIEW_RT
+TAO/tests/Bug_3251_Regression/run_test.pl: !ST !LabVIEW_RT
TAO/tests/DIOP/run_test.pl: !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO !LabVIEW_RT
TAO/tests/DIOP/run_test_ipv6.pl: IPV6 !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO !LabVIEW_RT
TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !LabVIEW_RT
diff --git a/ACE/bin/tao_other_tests.lst b/ACE/bin/tao_other_tests.lst
index 85f591ff5ec..a72048fa7b0 100644
--- a/ACE/bin/tao_other_tests.lst
+++ b/ACE/bin/tao_other_tests.lst
@@ -124,6 +124,7 @@ TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.rt.conf: IPV6 !ST !STATIC
TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86