You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2022/09/18 11:40:09 UTC
[mynewt-nimble] branch travis-dev updated (c5663114 -> 4434833e)
This is an automated email from the ASF dual-hosted git repository.
andk pushed a change to branch travis-dev
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
discard c5663114 travis: Refactor
new 4434833e travis: Refactor
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c5663114)
\
N -- N -- N refs/heads/travis-dev (4434833e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
[mynewt-nimble] 01/01: travis: Refactor
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch travis-dev
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 4434833ec0262fc1502136de77f19b43a32b16e0
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Wed Sep 14 08:22:36 2022 +0200
travis: Refactor
---
.travis.yml | 206 +++++++++++-----------------
tests/build_variants | 3 +
tests/project.yml | 38 +++++
tests/scripts/build_targets.py | 73 ++++++++++
tests/scripts/check_style.py | 111 +++++++++++++++
.style_ignored_dirs => tests/style_ign_dirs | 0
tests/targets/ll/cmac/pkg.yml | 4 +
tests/targets/ll/cmac/syscfg.yml | 18 +++
tests/targets/ll/cmac/target.yml | 3 +
tests/targets/ll/nrf52840/pkg.yml | 4 +
tests/targets/ll/nrf52840/syscfg.yml | 0
tests/targets/ll/nrf52840/target.yml | 5 +
tests/targets/ll/nrf5340_net/pkg.yml | 4 +
tests/targets/ll/nrf5340_net/syscfg.yml | 0
tests/targets/ll/nrf5340_net/target.yml | 3 +
tests/targets/ll/pkg.yml | 2 +
tests/targets/ll/syscfg.yml | 36 +++++
uncrustify.cfg | 3 -
18 files changed, 382 insertions(+), 131 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d3dd9742..edd9ffd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,142 +15,92 @@
# specific language governing permissions and limitations
# under the License.
-language: go
-
-dist: bionic
-
-_addons: &addon_conf
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - gcc-multilib
- - gcc-7-multilib
- - g++-multilib
-
-go:
- - "1.16"
+os: linux
+dist: jammy
+language: shell
git:
- depth: false
-
-matrix:
- allow_failures:
- - env:
- - TEST=BUILD_PORTS
- - VM_AMOUNT=1
- - TARGET_SET=1
- include:
- # Style checking
- - os: linux
- language: python
- python:
- - "3.5"
- addons:
- apt:
- packages:
- - "python3-pip"
- env:
- - TEST=STYLE
- - DEBUG=1
-
- # newt build <targets>
- - os: linux
- addons: *addon_conf
- env:
- - TEST=BUILD_TARGETS
- - VM_AMOUNT=4
- - TARGET_SET=1
- - os: linux
- addons: *addon_conf
- env:
- - TEST=BUILD_TARGETS
- - VM_AMOUNT=4
- - TARGET_SET=2
- - os: linux
- addons: *addon_conf
- env:
- - TEST=BUILD_TARGETS
- - VM_AMOUNT=4
- - TARGET_SET=3
- - os: linux
- addons: *addon_conf
- env:
- - TEST=BUILD_TARGETS
- - VM_AMOUNT=4
- - TARGET_SET=4
+ depth: 1
- # newt test all (Linux)
- - os: linux
- addons: *addon_conf
- env:
- - TEST=TEST_ALL
- - VM_AMOUNT=2
- - TARGET_SET=1
- - os: linux
- addons: *addon_conf
- env:
- - TEST=TEST_ALL
- - VM_AMOUNT=2
- - TARGET_SET=2
-
- # ports
- - os: linux
- addons: *addon_conf
- env:
- - TEST=BUILD_PORTS
- - VM_AMOUNT=1
- - TARGET_SET=1
+cache:
+ ccache: true
+ directories:
+ - $HOME/.ccache
+ - $HOME/gcc-arm-none-eabi
- - os: windows
- env:
- - TEST=BUILD_TARGETS_WINDOWS
- - VM_AMOUNT=1
- - TARGET_SET=1
+_style-before_script: &prepare-style
+ - cd ${TRAVIS_BUILD_DIR}
+ - git fetch origin --deepen=100 refs/pull/$TRAVIS_PULL_REQUEST/head
+ - git checkout -q FETCH_HEAD
-before_install:
- - printenv
- - export GOPATH=$HOME/gopath
+_build-install: &install-build_targets
+ # install newt
+ - eval "$(gimme 1.16)"
- go version
-
-install:
- - git clone https://github.com/JuulLabs-OSS/mynewt-travis-ci $HOME/ci
- - chmod +x $HOME/ci/*.sh
+ - go get mynewt.apache.org/newt/newt@latest
+ - newt version
+ # install toolchain
- |
- if [ "${TEST}" == "STYLE" ]; then
- pip3 install requests
- else
- $HOME/ci/${TRAVIS_OS_NAME}_travis_install.sh
+ if [ ! -d ~/gcc-arm-none-eabi ]; do
+ mkdir ~/gcc-arm-none-eabi
+ wget -qO- "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz" | tar xvJ --strip 1 -C ~/gcc-arm-none-eabi
+ for t in ~/gcc-arm-none-eabi/bin/arm-none-eabi-*; do ln -sf $(which ccache) ~/bin/$(basename "$t"); done
fi
+ export PATH=$PATH:~/gcc-arm-none-eabi/bin
-before_script:
- - |
- if [ "${TEST}" == "STYLE" ]; then
- $HOME/ci/install_uncrustify.sh
- else
- newt version
- gcc --version
- if [ "${TEST}" != "TEST_ALL" ]; then arm-none-eabi-gcc --version; fi
- cp -R $HOME/ci/mynewt-nimble-project.yml project.yml
- mkdir -p targets
- cp -R $HOME/ci/mynewt-nimble-targets targets
- $HOME/ci/prepare_test.sh $VM_AMOUNT
- mkdir -p repos && pushd repos/
- git clone --depth=1 https://github.com/apache/mynewt-core apache-mynewt-core
- git clone --depth=1 https://github.com/JuulLabs-OSS/mcuboot mcuboot
- git clone --depth=1 https://github.com/apache/mynewt-mcumgr apache-mynewt-mcumgr
- popd
- fi
+_install-babblesim: &install-babblesim
+ # install newt
+ - eval "$(gimme 1.16)"
+ - go version
+ - go get mynewt.apache.org/newt/newt@latest
+ - newt version
+ # install repo
+ - curl -o ~/bin/repo https://storage.googleapis.com/git-repo-downloads/repo
+ - gpg --recv-key 8BB9AD793E8E6153AF0F9A4416530D5E920F5C65
+ - curl -s https://storage.googleapis.com/git-repo-downloads/repo.asc | gpg --verify - ~/bin/repo
+ - chmod +x ~/bin/repo
+ # install babblesim
+ - sudo apt update && sudo apt -y install gcc-multilib libfftw3-dev
+ - mkdir -p ~/nrfx && cd ~/nrfx
+ - git clone --depth=1 https://github.com/NordicSemiconductor/nrfx.git .
+ - mkdir -p ~/bsim && cd ~/bsim
+ - git config --global color.ui false
+ - repo init --depth=1 -u https://github.com/BabbleSim/manifest.git -m everything.xml -b master
+ - repo sync
+ - export NRFX_BASE=~/nrfx/
+ - export BSIM_OUT_PATH=~/bsim/
+ - export BSIM_COMPONENTS_PATH=${BSIM_OUT_PATH}/components/
+ - make everything -j 8
-script:
- - |
- if [ "${TEST}" == "STYLE" ]; then
- python3 $HOME/ci/check_style.py
- else
- $HOME/ci/run_test.sh
- fi
+_prepare-project: &prepare-project
+ - mkdir -p ~/mynewt-ci && cd ~/mynewt-ci
+ - git clone --depth=1 https://github.com/apache/mynewt-core.git repos/apache-mynewt-core
+ - git clone --depth=1 https://github.com/apache/mynewt-mcumgr.git repos/apache-mynewt-mcumgr
+ - git clone --depth=1 https://github.com/mcu-tools/mcuboot.git repos/mcuboot
+ - git clone --depth=1 https://github.com/hathach/tinyusb.git repos/tinyusb
+ - mv ${TRAVIS_BUILD_DIR} repos/apache-mynewt-nimble
+ - cd repos/apache-mynewt-nimble
+ - cp tests/project.yml ../..
-cache:
- directories:
- - $HOME/TOOLCHAIN
- - $HOME/Library/Caches/Homebrew
+jobs:
+ include:
+ - name: Style check
+ if: type IN (pull_request)
+ install: sudo apt update && sudo apt -y install uncrustify
+ before_script: *prepare-style
+ script: ./tests/scripts/check_style.py
+
+ - name: Build targets (LL)
+ install: *install-build_targets
+ before_script: *prepare-project
+ script: ./tests/scripts/build_targets.py tests/targets/ll/
+
+ - name: Build targets (samples)
+ install: *install-build_targets
+ before_script: *prepare-project
+ script: ./tests/scripts/build_targets.py targets/
+
+ - name: BabbleSim
+ install: *install-babblesim
+ before_script: *prepare-project
+ script: ./tests/scripts/build_targets.py babblesim/targets/
diff --git a/tests/build_variants b/tests/build_variants
new file mode 100644
index 00000000..616a8508
--- /dev/null
+++ b/tests/build_variants
@@ -0,0 +1,3 @@
+[@apache-mynewt-nimble/tests/targets/ll/nrf52840]
+no_encryption
+no_privacy
\ No newline at end of file
diff --git a/tests/project.yml b/tests/project.yml
new file mode 100644
index 00000000..84daaa5e
--- /dev/null
+++ b/tests/project.yml
@@ -0,0 +1,38 @@
+project.name: "apache-mynewt-nimble"
+
+project.repositories:
+ - apache-mynewt-core
+ - apache-mynewt-nimble
+ - apache-mynewt-mcumgr
+ - mcuboot
+ - tinyusb
+
+repository.apache-mynewt-core:
+ type: github
+ vers: 0.0.0
+ user: apache
+ repo: mynewt-core
+
+repository.apache-mynewt-nimble:
+ type: github
+ vers: 0.0.0
+ user: apache
+ repo: mynewt-nimble
+
+repository.apache-mynewt-mcumgr:
+ type: github
+ vers: 0.0.0
+ user: apache
+ repo: mynewt-mcumgr
+
+repository.mcuboot:
+ type: github
+ vers: 0.0.0
+ user: mcu-tools
+ repo: mcuboot
+
+repository.tinyusb:
+ type: github
+ vers: 0.0.0
+ user: hathach
+ repo: tinyusb
diff --git a/tests/scripts/build_targets.py b/tests/scripts/build_targets.py
new file mode 100755
index 00000000..a885e219
--- /dev/null
+++ b/tests/scripts/build_targets.py
@@ -0,0 +1,73 @@
+#!/usr/bin/python
+
+import configparser
+import getopt
+import os
+import subprocess
+import sys
+
+
+def run_cmd(cmd: str) -> list[str]:
+ out = subprocess.check_output(cmd, text=True, shell=True)
+ return out.splitlines()
+
+
+def run_build_cmd(cmd: str) -> bool:
+ cp = subprocess.run(cmd, stdout=subprocess.DEVNULL, text=True, shell=True)
+
+ return cp.returncode == 0
+
+
+def build_target(target: str, variant: str = None) -> bool:
+ if variant is None:
+ print(f"\033[33m{target}\033[0m")
+ ret = run_build_cmd(f"newt build {target}")
+ else:
+ print(f"\033[33m{target} ({variant})\033[0m")
+ ret = run_build_cmd(f"newt build -STESTS_VARIANT={variant} {target}")
+
+ return ret
+
+
+def main() -> bool:
+ prefix = "@apache-mynewt-nimble/"
+
+ try:
+ opts, args = getopt.getopt(sys.argv[1:], "a")
+ for o, a in opts:
+ if o == "-a":
+ prefix = ""
+ except getopt.GetoptError as err:
+ print(err)
+ sys.exit(1)
+
+ filters_inc = tuple([f"{prefix}{f}" for f in args if not f.startswith("~")])
+ filters_exc = tuple([f"{prefix}{f[1:]}" for f in args if f.startswith("~")])
+
+ cfg_fname = os.path.join(os.path.dirname(__file__), "../build_variants")
+ vcfg = configparser.ConfigParser(allow_no_value=True)
+ vcfg.read(cfg_fname)
+
+ has_error = False
+
+ targets = run_cmd("newt target list -a")
+ for target in targets:
+ if len(filters_inc) > 0 and not target.startswith(filters_inc):
+ continue
+ if len(filters_exc) > 0 and target.startswith(filters_exc):
+ continue
+
+ if not build_target(target):
+ has_error = True
+
+ if vcfg.has_section(target):
+ for variant, _ in vcfg.items(target):
+ if not build_target(target, variant):
+ has_error = True
+
+ return not has_error
+
+
+if __name__ == "__main__":
+ if not main():
+ sys.exit(1)
diff --git a/tests/scripts/check_style.py b/tests/scripts/check_style.py
new file mode 100755
index 00000000..61e9159e
--- /dev/null
+++ b/tests/scripts/check_style.py
@@ -0,0 +1,111 @@
+#!/usr/bin/python
+
+import os.path
+import re
+import subprocess
+import tempfile
+import sys
+
+
+def get_lines_range(m: re.Match) -> range:
+ first = int(m.group(1))
+
+ if m.group(2) is not None:
+ last = first + int(m.group(2))
+ else:
+ last = first + 1
+
+ return range(first, last)
+
+
+def run_cmd(cmd: str) -> list[str]:
+ out = subprocess.check_output(cmd, text=True, shell=True)
+ return out.splitlines()
+
+
+def check_file(fname: str, commit: str, upstream: str) -> list[str]:
+ ret = []
+
+ diff_lines = set()
+ for s in run_cmd(f"git diff -U0 {upstream} {commit} -- {fname}"):
+ m = re.match(r"^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@", s)
+ if not m:
+ continue
+ diff_lines.update(get_lines_range(m))
+
+ with tempfile.NamedTemporaryFile(suffix=os.path.basename(fname)) as tmpf:
+ lines = subprocess.check_output(f"git show {commit}:{fname}",
+ shell=True)
+ tmpf.write(lines)
+
+ in_chunk = False
+
+ for s in run_cmd(f"uncrustify -q -c uncrustify.cfg -f {tmpf.name} | "
+ f"diff -u0 -p {tmpf.name} - || true"):
+ m = re.match(r"^@@ -(\d+)(?:,(\d+))? \+\d+(?:,\d+)? @@", s)
+ if not m:
+ if in_chunk:
+ ret.append(s)
+ continue
+
+ in_chunk = len(diff_lines & set(get_lines_range(m))) != 0
+
+ if in_chunk:
+ ret.append(s)
+
+ return ret
+
+
+def is_ignored(fname: str, ign_dirs: list[str]) -> bool:
+ if not re.search(r"\.(c|cpp|h|hpp)$", fname):
+ return True
+
+ for d in ign_dirs:
+ if fname.startswith(d):
+ return True
+
+ return False
+
+
+def main() -> bool:
+ if len(sys.argv) > 1:
+ commit = sys.argv[1]
+ else:
+ commit = "HEAD"
+ if len(sys.argv) > 2:
+ upstream = sys.argv[2]
+ else:
+ upstream = "origin/master"
+
+ mb = run_cmd(f"git merge-base {upstream} {commit}")
+ upstream = mb[0]
+
+ has_error = False
+
+ cfg_fname = os.path.join(os.path.dirname(__file__), "../style_ign_dirs")
+ with open(cfg_fname, "r") as x:
+ ign_dirs = [s.strip() for s in x.readlines() if
+ s.strip() and not s.startswith("#")]
+
+ files = run_cmd(f"git diff --diff-filter=AM --name-only {upstream} {commit}")
+ for cfg_fname in files:
+ if is_ignored(cfg_fname, ign_dirs):
+ print(f"\033[90m- {cfg_fname}\033[0m")
+ continue
+
+ diff = check_file(cfg_fname, commit, upstream)
+ if len(diff) > 0:
+ print(f"\033[31m! {cfg_fname}\033[0m")
+ print()
+ print("\n".join(diff))
+ print()
+ has_error = True
+ else:
+ print(f"+ {cfg_fname}")
+
+ return not has_error
+
+
+if __name__ == "__main__":
+ if not main():
+ sys.exit(1)
diff --git a/.style_ignored_dirs b/tests/style_ign_dirs
similarity index 100%
rename from .style_ignored_dirs
rename to tests/style_ign_dirs
diff --git a/tests/targets/ll/cmac/pkg.yml b/tests/targets/ll/cmac/pkg.yml
new file mode 100644
index 00000000..5bc957cd
--- /dev/null
+++ b/tests/targets/ll/cmac/pkg.yml
@@ -0,0 +1,4 @@
+pkg.name: tests/targets/ll/cmac
+pkg.type: target
+pkg.deps:
+ - tests/targets/ll
diff --git a/tests/targets/ll/cmac/syscfg.yml b/tests/targets/ll/cmac/syscfg.yml
new file mode 100644
index 00000000..8e499b3f
--- /dev/null
+++ b/tests/targets/ll/cmac/syscfg.yml
@@ -0,0 +1,18 @@
+syscfg.vals:
+ MCU_SLP_TIMER: 1
+ MCU_SLP_TIMER_32K_ONLY: 1
+ MCU_DEEP_SLEEP: 1
+ MCU_DEBUG_HCI_EVENT_ON_FAULT: 1
+ MCU_DEBUG_HCI_EVENT_ON_ASSERT: 1
+ MCU_DEBUG_DSER_HAL_OS_TICK: 0
+ MCU_DEBUG_DSER_CMAC_SHARED: 0
+ MCU_DEBUG_DSER_CMAC_SLEEP: 0
+ MCU_DEBUG_DSER_BLE_HCI_CMAC_LL: 0
+
+ BLE_LL_PUBLIC_DEV_ADDR: 0xc0dec000c3ac
+ BLE_LL_CONN_INIT_MIN_WIN_OFFSET: 4
+ BLE_LL_SCHED_AUX_MAFS_DELAY: 200
+ BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY: 150
+ BLE_LL_RFMGMT_ENABLE_TIME: 20
+ BLE_LL_HCI_VS_EVENT_ON_ASSERT: 0
+ BLE_LL_CFG_FEAT_LE_CODED_PHY: 0
diff --git a/tests/targets/ll/cmac/target.yml b/tests/targets/ll/cmac/target.yml
new file mode 100644
index 00000000..e3ca85cd
--- /dev/null
+++ b/tests/targets/ll/cmac/target.yml
@@ -0,0 +1,3 @@
+target.app: "@apache-mynewt-nimble/apps/blehci"
+target.bsp: "@apache-mynewt-core/hw/bsp/dialog_cmac"
+target.build_profile: speed
diff --git a/tests/targets/ll/nrf52840/pkg.yml b/tests/targets/ll/nrf52840/pkg.yml
new file mode 100644
index 00000000..f7d4b994
--- /dev/null
+++ b/tests/targets/ll/nrf52840/pkg.yml
@@ -0,0 +1,4 @@
+pkg.name: tests/targets/ll/nrf52840
+pkg.type: target
+pkg.deps:
+ - tests/targets/ll
diff --git a/tests/targets/ll/nrf52840/syscfg.yml b/tests/targets/ll/nrf52840/syscfg.yml
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/targets/ll/nrf52840/target.yml b/tests/targets/ll/nrf52840/target.yml
new file mode 100644
index 00000000..a01c8322
--- /dev/null
+++ b/tests/targets/ll/nrf52840/target.yml
@@ -0,0 +1,5 @@
+target.app: "@apache-mynewt-nimble/apps/blehci"
+target.bsp: "@apache-mynewt-core/hw/bsp/nordic_pca10056"
+target.build_profile: debug
+#target.build_profile: optimized
+#target.build_profile: speed
diff --git a/tests/targets/ll/nrf5340_net/pkg.yml b/tests/targets/ll/nrf5340_net/pkg.yml
new file mode 100644
index 00000000..8a928aa1
--- /dev/null
+++ b/tests/targets/ll/nrf5340_net/pkg.yml
@@ -0,0 +1,4 @@
+pkg.name: tests/targets/ll/nrf5340_net
+pkg.type: target
+pkg.deps:
+ - tests/targets/ll
diff --git a/tests/targets/ll/nrf5340_net/syscfg.yml b/tests/targets/ll/nrf5340_net/syscfg.yml
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/targets/ll/nrf5340_net/target.yml b/tests/targets/ll/nrf5340_net/target.yml
new file mode 100644
index 00000000..9064063c
--- /dev/null
+++ b/tests/targets/ll/nrf5340_net/target.yml
@@ -0,0 +1,3 @@
+target.app: "@apache-mynewt-nimble/apps/blehci"
+target.bsp: "@apache-mynewt-core/hw/bsp/nordic_pca10095_net"
+target.build_profile: debug
diff --git a/tests/targets/ll/pkg.yml b/tests/targets/ll/pkg.yml
new file mode 100644
index 00000000..6ddafd56
--- /dev/null
+++ b/tests/targets/ll/pkg.yml
@@ -0,0 +1,2 @@
+pkg.name: tests/targets/ll
+pkg.type: config
diff --git a/tests/targets/ll/syscfg.yml b/tests/targets/ll/syscfg.yml
new file mode 100644
index 00000000..9daa9536
--- /dev/null
+++ b/tests/targets/ll/syscfg.yml
@@ -0,0 +1,36 @@
+syscfg.defs:
+ TESTS_VARIANT:
+ description:
+ value: default
+ choices:
+ - default
+ - no_coded
+ - no_privacy
+ - no_encryption
+
+syscfg.vals:
+ BLE_VERSION: 53
+ BLE_LL_CFG_FEAT_LE_ENCRYPTION: 1
+ BLE_LL_CFG_FEAT_CONN_PARAM_REQ: 1
+ BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG: 1
+ BLE_LL_CFG_FEAT_LE_PING: 1
+ BLE_LL_CFG_FEAT_DATA_LEN_EXT: 1
+ BLE_LL_CFG_FEAT_LL_PRIVACY: 1
+ BLE_LL_CFG_FEAT_LE_CSA2: 1
+ BLE_LL_CFG_FEAT_LE_2M_PHY: 1
+ BLE_LL_CFG_FEAT_LE_CODED_PHY: 1
+ BLE_LL_CFG_FEAT_LL_EXT_ADV: 1
+ BLE_LL_CFG_FEAT_LL_PERIODIC_ADV: 1
+ BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER: 1
+ BLE_LL_CFG_FEAT_CTRL_TO_HOST_FLOW_CONTROL: 1
+ BLE_LL_CFG_FEAT_LL_SCA_UPDATE: 1
+ BLE_LL_CFG_FEAT_LL_ENHANCED_CONN_UPDATE: 1
+
+syscfg.vals.'TESTS_VARIANT=="no_coded"':
+ BLE_LL_CFG_FEAT_LE_CODED_PHY: 0
+
+syscfg.vals.'TESTS_VARIANT=="no_privacy"':
+ BLE_LL_CFG_FEAT_LL_PRIVACY: 0
+
+syscfg.vals.'TESTS_VARIANT=="no_encryption"':
+ BLE_LL_CFG_FEAT_LL_ENCRYPTION: 0
diff --git a/uncrustify.cfg b/uncrustify.cfg
index 481a62ab..d5f85763 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -677,9 +677,6 @@ sp_try_brace = ignore # ignore/add/remove/force
# Add or remove space between get/set and '{' if on the same line
sp_getset_brace = ignore # ignore/add/remove/force
-# Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add
-sp_word_brace = add # ignore/add/remove/force
-
# Add or remove space between a variable and '{' for a namespace. Default=Add
sp_word_brace_ns = add # ignore/add/remove/force