Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ framework: checkvariantchange createdirs download_and_build
@${ECHOE} ${GREEN}Framework downloaded and built${NC}
@make test VARIANT=${VARIANT}
@cp -r $(UT_CONTROL)/build/$(TARGET)/lib/libut_control.* $(LIB_DIR) $(BIN_DIR)
@cp -r $(UT_CONTROL)/build/$(TARGET)/curl/lib/libcurl.so* $(LIB_DIR) $(BIN_DIR)
@cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/libssl.so* $(LIB_DIR) $(BIN_DIR)
@cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/libcrypto.so* $(LIB_DIR) $(BIN_DIR)
@${ECHOE} ${GREEN}ut-control LIB Copied to [${BIN_DIR}]${NC}
@if [ -d "$(TOP_DIR)/../include" ] && [ -d "$(BUILD_DIR)/src" ]; then \
${UT_CORE_DIR}/compare-functions-in-headers-testsuite.sh $(TOP_DIR)/../include $(BIN_DIR)/${TARGET_EXEC} ${TARGET}; \
Expand Down
3 changes: 2 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ else
check_ut_control_revision
# Check out the version required based on control_revision
pushd ${UT_CONTROL_LIB_DIR} > /dev/null
git checkout ${UT_CONTROL_PROJECT_VERSION} # MARKER: Version=${UT_CONTROL_PROJECT_VERSION}
#git checkout ${UT_CONTROL_PROJECT_VERSION} # MARKER: Version=${UT_CONTROL_PROJECT_VERSION}
git checkout feature/gh79-ut-control-reduce-size # MARKER: Version=${UT_CONTROL_PROJECT_VERSION}
Copy link
Contributor

Choose a reason for hiding this comment

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

you need to revert this one.

# Note: The above line can be modified by release test scripts to checkout a specific version or branch
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change needs to be reverted before final approval.

popd > /dev/null
configure_ut_control
Expand Down