diff options
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/bin/tao_other_tests.lst | 4 | ||||
| -rw-r--r-- | ACE/tests/Unload_libACE.cpp | 10 | ||||
| -rw-r--r-- | ACE/tests/tests.mpc | 2 | ||||
| -rw-r--r-- | ACE/tests/unload_libace.mpb | 6 |
5 files changed, 29 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 0fd511c0663..0171bdd1d58 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,15 @@ +Wed Jan 3 13:16:16 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * bin/tao_other_tests.lst: + + Added !NO_MCAST to those tests that use multicast. + + * tests/Unload_libACE.cpp: + * tests/tests.mpc: + * tests/unload_libace.mpb: + + Added support for running this test when ace_for_tao is enabled. + Wed Jan 3 12:33:33 UTC 2007 Chad Elliott <elliott_c@ociweb.com> * include/makeinclude/wrapper_macros.GNU: diff --git a/ACE/bin/tao_other_tests.lst b/ACE/bin/tao_other_tests.lst index 8cc2645f6f2..4b9d8a0be31 100644 --- a/ACE/bin/tao_other_tests.lst +++ b/ACE/bin/tao_other_tests.lst @@ -92,7 +92,7 @@ TAO/orbsvcs/tests/Event/UDP/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICR TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:!ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO +TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl: !NO_MCAST !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO @@ -161,5 +161,5 @@ TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !CORBA_E_COMPACT ! TAO/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO -TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !NO_MCAST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp index f18484b6b82..8d30c021f08 100644 --- a/ACE/tests/Unload_libACE.cpp +++ b/ACE/tests/Unload_libACE.cpp @@ -150,10 +150,16 @@ main (int, char **) char buf[BUFSIZ]; strcpy (buf, ace_root); + strcat (buf, "/lib/lib"); +#if defined (ACE_LIB_NAME) + strcat (buf, ACE_LIB_NAME); +#else + strcat (buf, "ACE"); +#endif /* ACE_LIB_NAME */ #if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1)) - strcat (buf, "/lib/libACE.sl"); + strcat (buf, ".sl"); #else - strcat (buf, "/lib/libACE.so"); + strcat (buf, ".so"); #endif /* (__hpux) */ handle = dlopen (buf, RTLD_LAZY); diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 854ea60ce0c..4b6a8b01990 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -1367,7 +1367,7 @@ project(Based Pointer Test) : acetest { } } -project(Library Unload) { +project(Library Unload): unload_libace { avoids += wince exename = UnloadLibACE staticflags += ACE_AS_STATIC_LIBS diff --git a/ACE/tests/unload_libace.mpb b/ACE/tests/unload_libace.mpb new file mode 100644 index 00000000000..7fe13bae305 --- /dev/null +++ b/ACE/tests/unload_libace.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +feature(ace_for_tao) { + macros += ACE_LIB_NAME=\\"ACE_FOR_TAO\\" +}
\ No newline at end of file |