Skip to content

Update unit tests to use new branch #61

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

Merged
merged 4 commits into from
Jun 17, 2021
Merged

Update unit tests to use new branch #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a134d5
fix paths in unittests
paul-szczepanek-arm Jun 6, 2021
c99d171
update cmakelists for unitests to match new mbed-os cmake
paul-szczepanek-arm Jun 6, 2021
278f7cb
enable DeviceInformation UnitTest
paul-szczepanek-arm Jun 6, 2021
65f8c8c
update to use new branch
paul-szczepanek-arm Jun 6, 2021
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 scripts/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

set -xe

# Enter repository root
cd "$( dirname "${BASH_SOURCE[0]}" )"/..

Expand All @@ -26,7 +28,7 @@ then
else
# git clone https://github.com/ARMmbed/mbed-os.git
# Use feature branch until merged to master
git clone --depth 1 https://github.com/paul-szczepanek-arm/mbed-os.git -b unittest dependencies/mbed-os
git clone --depth 1 https://github.com/paul-szczepanek-arm/mbed-os.git -b cmake-ble-rebased dependencies/mbed-os
fi

# Add symlinks
Expand Down
8 changes: 4 additions & 4 deletions tests/UNITTESTS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.0.2)

set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
set(SERVICES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../services CACHE INTERNAL "")
set(mbed-os_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")

project(unittests)

enable_testing()

add_subdirectory(${MBED_PATH}/UNITTESTS)
include(CTest)
add_subdirectory(mbed-os/UNITTESTS)

add_subdirectory(Template)
add_subdirectory(LinkLoss)
add_subdirectory(DeviceInformation)
2 changes: 1 addition & 1 deletion tests/UNITTESTS/DeviceInformation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ target_include_directories(${TEST_NAME}
PRIVATE
.
${SERVICES_PATH}/DeviceInformation/include
${MBED_PATH}/connectivity/FEATURE_BLE/include/ble/gap
${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble/gap
)

target_sources(${TEST_NAME}
Expand Down
2 changes: 1 addition & 1 deletion tests/UNITTESTS/LinkLoss/test_LinkLossService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "ble/gap/ChainableGapEventHandler.h"
#include "ble-service-link-loss/LinkLossService.h"

#include "Events.h"
#include "ble/gap/Events.h"

#include "ble_mocks.h"
#include "events/EventQueue.h"
Expand Down