Skip to content

PR : gh #231: Refactor makefile to include changes in ut-control #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kanjoe24 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

PR : gh #231: Refactor makefile to include changes in ut-control #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ COMPILER := $(if $(filter CPP,$(VARIANT)),$(CXX),$(CC))
#CC := arm-rdk-linux-gnueabi-gcc -mthumb -mfpu=vfp -mcpu=cortex-a9 -mfloat-abi=soft -mabi=aapcs-linux -mno-thumb-interwork -ffixed-r8 -fomit-frame-pointer
# CFLAGS will be overriden by Caller as required
INC_DIRS += $(UT_CORE_DIR)/sysroot/usr/include
UT_CONTROL_COMPILER := $(CC)
else
COMPILER := $(if $(filter CPP,$(VARIANT)),g++ -ggdb -o0 -Wall, gcc -ggdb -o0 -Wall)
UT_CONTROL_COMPILER := gcc -ggdb -o0 -Wall
endif

# Common object file setup
Expand Down Expand Up @@ -142,7 +144,7 @@ download_and_build:
@${UT_CORE_DIR}/build.sh TARGET=${TARGET} VARIANT=${VARIANT}
@${ECHOE} ${GREEN}Completed${NC}
@${ECHOE} ${GREEN}Entering ut-control [TARGET=${TARGET}]${NC}
@${MAKE} -C $(UT_CONTROL) TARGET=${TARGET}
@${MAKE} -C $(UT_CONTROL) TARGET=${TARGET} CC="${UT_CONTROL_COMPILER}"

# Build the test binary
test: $(OBJS) createdirs $(if $(BUILD_WEAK_STUBS_SRC),$(WEAK_STUBS_LIB))
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ popd > /dev/null # ${MY_DIR}
# Therefore in that case it warns you but doesnt' chnage to that version, which could cause your tests to break.
# Change this to upgrade your ut-control Major versions. Non ABI Changes 1.x.x are supported, between major revisions

UT_CONTROL_PROJECT_VERSION="2.0.0" # Fixed version
UT_CONTROL_PROJECT_VERSION="feature/gh109_Makefile_Update_avoid_hardcodedpaths" # Fixed version
Copy link
Contributor Author

@kanjoe24 kanjoe24 Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update this to latest ut-control before merging.

Copy link
Contributor

@Ulrond Ulrond Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need a feature branch for that, unless you are doing changes for ut-core, just upgrade it as part of your release branch...


# Clone the Unit Test Requirements
UT_CONTROL_REPO=git@github.com:rdkcentral/ut-control.git
Expand Down