diff options
author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-09 19:58:03 +0000 |
---|---|---|
committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-09 19:58:03 +0000 |
commit | cbad195f32924d90ec8b5dd1b9a71b786a875eb9 (patch) | |
tree | 7a8f744c9d2ebeb49bbff88c63be39fef1bf7bf3 | |
parent | 3e4f0813c894dad6fd2a15424bcf424d2ade5638 (diff) | |
download | ATCD-cbad195f32924d90ec8b5dd1b9a71b786a875eb9.tar.gz |
Merged revisions 81302 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE
........
r81302 | johnnyw | 2008-04-09 13:24:56 -0500 (Wed, 09 Apr 2008) | 1 line
Wed Apr 9 18:24:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
-rw-r--r-- | ACE/ChangeLog | 5 | ||||
-rw-r--r-- | ACE/bin/tao_orb_tests.lst | 2 |
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 |