The Kconfig language provides a unit test that can be run. As these require pytest to be installed and run very quickly, bundle them in to an existing CI job.
Signed-off-by: Tom Rini trini@konsulko.com --- Changes in v2: - Have Azure use O=${UBOOT_TRAVIS_BUILD_DIR} as pwd is not writable. --- .azure-pipelines.yml | 5 +++-- .gitlab-ci.yml | 7 ++++--- .travis.yml | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index f66d58aa76f9..01b6eda359b6 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -120,7 +120,7 @@ jobs: make tools-only_config envtools -j$(nproc)
- job: utils - displayName: 'Run binman, buildman, dtoc and patman testsuites' + displayName: 'Run binman, buildman, dtoc, Kconfig and patman testsuites' pool: vmImage: $(ubuntu_vm) steps: @@ -135,7 +135,7 @@ jobs: export USER=azure virtualenv -p /usr/bin/python3 /tmp/venv . /tmp/venv/bin/activate - pip install pyelftools + pip install pyelftools pytest export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH} @@ -144,6 +144,7 @@ jobs: ./tools/buildman/buildman -t ./tools/dtoc/dtoc -t ./tools/patman/patman --test + make O=${UBOOT_TRAVIS_BUILD_DIR} testconfig EOF cat build.sh # We cannot use "container" like other jobs above, as buildman diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55943bb3a245..f43b3c26ef81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,7 +157,7 @@ Build envtools: script: - make tools-only_config envtools -j$(nproc)
-Run binman, buildman, dtoc and patman testsuites: +Run binman, buildman, dtoc, Kconfig and patman testsuites: tags: [ 'all' ] stage: testsuites script: @@ -166,7 +166,7 @@ Run binman, buildman, dtoc and patman testsuites: export USER=gitlab; virtualenv -p /usr/bin/python3 /tmp/venv; . /tmp/venv/bin/activate; - pip install pyelftools; + pip install pyelftools pytest; export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; @@ -174,7 +174,8 @@ Run binman, buildman, dtoc and patman testsuites: ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test; ./tools/buildman/buildman -t; ./tools/dtoc/dtoc -t; - ./tools/patman/patman --test + ./tools/patman/patman --test; + make testconfig
# Test sandbox with test.py sandbox test.py: diff --git a/.travis.yml b/.travis.yml index c59bd7790b66..1914f98dfaa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -152,7 +152,8 @@ script: ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test && ./tools/patman/patman --test && ./tools/buildman/buildman -t && - ./tools/dtoc/dtoc -t; + ./tools/dtoc/dtoc -t && + make testconfig; fi; fi