summaryrefslogtreecommitdiff
path: root/TAO/bin
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2018-10-30 11:46:56 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2018-10-30 11:46:56 +0100
commit50c131d843bf9f7c38d00ec0a4c26881756aa9aa (patch)
treee28d149786b4aeb3b20a5508727e167ae1ef493a /TAO/bin
parent1a7f9bc556a6a74c2a66065af0f0b9489b5aca1e (diff)
parentf776ce71367a69b891db4164f744d62b2ca06205 (diff)
downloadATCD-50c131d843bf9f7c38d00ec0a4c26881756aa9aa.tar.gz
Merge branch 'ssliop_corbaloc_parser_comma_fix' of git://github.com/milan-mpathix/ATCD into milan-mpathix-ssliop_corbaloc_parser_comma_fix
Diffstat (limited to 'TAO/bin')
-rw-r--r--TAO/bin/tao_other_tests.lst1
1 files changed, 1 insertions, 0 deletions
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index 9cc7c20e94e..8f84e6ed4fe 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -213,6 +213,7 @@ TAO/orbsvcs/tests/Property/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICR
TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS
#HANGS TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane
#HANGS'TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir
+TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO