Skip to content

Commit

Permalink
Changed the executable name when there is a TARGET_PLATFORM and added…
Browse files Browse the repository at this point in the history
… it to the tests
  • Loading branch information
basvodde committed Dec 17, 2012
1 parent 38f3a67 commit ed22c6e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ test_all: start test_old_make
@echo Building without Standard C library includes
$(TIME) make CPPUTEST_USE_STD_C_LIB=N all_no_tests
make CPPUTEST_USE_STD_C_LIB=N clean
@echo Building with a different TARGET_PLATFORM
make TARGET_PLATFORM=real_platform
@echo Building with overridden CXXFLAGS and CFLAGS and memory leak and STDC++ disabled
$(TIME) make CLFAGS="" CXXFLAGS="" CPPFLAGS="-Iinclude -DCPPUTEST_STD_CPP_LIB_DISABLED -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED"
make CFLAGS="" CXXFLAGS="" CPPFLAGS="-DCPPUTEST_STD_CPP_LIB_DISABLED -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED" clean
Expand Down
10 changes: 5 additions & 5 deletions build/MakefileWorker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,7 @@ ifneq ($(CPPUTEST_USE_VPATH), Y)
CPPUTEST_USE_VPATH :=
endif

ifndef TARGET_PLATFORM
CPPUTEST_LIB_LINK_DIR = $(CPPUTEST_LIB_DIR)
else
CPPUTEST_LIB_LINK_DIR = $(CPPUTEST_LIB_DIR)/$(TARGET_PLATFORM)
endif

# --------------------------------------
# derived flags in the following area
Expand Down Expand Up @@ -321,7 +317,11 @@ TARGET_LIB = \
$(CPPUTEST_LIB_DIR)/lib$(COMPONENT_NAME).a

ifndef TEST_TARGET
TEST_TARGET = $(COMPONENT_NAME)_tests
ifndef TARGET_PLATFORM
TEST_TARGET = $(COMPONENT_NAME)_tests
else
TEST_TARGET = $(COMPONENT_NAME)_$(TARGET_PLATFORM)_tests
endif
endif

#Helper Functions
Expand Down

0 comments on commit ed22c6e

Please sign in to comment.