summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-04-09 18:24:56 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-04-09 18:24:56 +0000
commit4ae4a5d1f33b41b69b2bb8862fa170b791eecbd4 (patch)
treeb78a0823ced28634966d659d56a1ff00f3f4966e
parentbce0245da71caa9a7daece7d4a902d3fe3e62357 (diff)
downloadATCD-4ae4a5d1f33b41b69b2bb8862fa170b791eecbd4.tar.gz
Wed Apr 9 18:24:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/bin/tao_orb_tests.lst2
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 5cb2ebbdf34..3ae48c7ebbf 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 9 18:24:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/tao_orb_tests.lst:
+ Don't run 3171 with CORBA/e micro
+
Wed Apr 9 11:50:27 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
* bin/MakeProjectCreator/modules/VXTestProjectCreator.pm:
diff --git a/ACE/bin/tao_orb_tests.lst b/ACE/bin/tao_orb_tests.lst
index 0fbb6bb3300..7e3ffae4600 100644
--- a/ACE/bin/tao_orb_tests.lst
+++ b/ACE/bin/tao_orb_tests.lst
@@ -117,7 +117,7 @@ TAO/tests/Bug_3042_Regression/run_test.pl: !LabVIEW_RT
TAO/tests/Bug_3108_Regression/run_test.pl: !ST !LabVIEW_RT
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_3171_Regression/run_test.pl: !ST !MINIMUM !NO_MESSAGING !LabVIEW_RT !CORBA_E_MICRO
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 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC
TAO/tests/Bug_3276_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LabVIEW_RT