From e352b95b5b40f9544d861a698d8918064b1edd6e Mon Sep 17 00:00:00 2001 From: levine Date: Fri, 19 Mar 1999 16:53:24 +0000 Subject: use ace_components to record which components are in the ACE library, and then not build/run tests that use Token and Other --- tests/Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'tests/Makefile') diff --git a/tests/Makefile b/tests/Makefile index fd20db54e59..4a2286ecb40 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -36,7 +36,6 @@ BIN = Aio_Platform_Test \ Message_Block_Test \ Message_Queue_Test \ Message_Queue_Notifications_Test \ - Naming_Test \ Notify_Performance_Test \ Process_Mutex_Test \ Process_Strategy_Test \ @@ -65,23 +64,33 @@ BIN = Aio_Platform_Test \ Task_Test \ Thread_Manager_Test \ Thread_Mutex_Test \ - Thread_Pool_Reactor_Test \ Thread_Pool_Test \ Timeprobe_Test \ Time_Service_Test \ Time_Value_Test \ Timer_Queue_Test \ - Tokens_Test \ TSS_Test \ UPIPE_SAP_Test \ - Upgradable_RW_Test \ - XtReactor_Test + Upgradable_RW_Test #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +#### If the ACE library wasn't built with all components, don't +#### try to build certain tests. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) + BIN += Naming_Test \ + Thread_Pool_Reactor_Test \ + XtReactor_Test +endif # ! Other +ifeq (Token,$(findstring Token,$(ACE_COMPONENTS))) + BIN += Tokens_Test +endif # ! Token + include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -- cgit v1.2.1