The qconfig tool has unit tests (qconfig.py -t) but they are not run by the test runner. Add them alongside the other tool tests so they run as part of 'make tcheck' and in the GitLab and Azure CI testsuites jobs, updating the job titles to mention qconfig.
Signed-off-by: Simon Glass <[email protected]> --- .azure-pipelines.yml | 3 ++- .gitlab-ci.yml | 3 ++- test/run | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 5bda11a0309..c44c28ee76e 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -146,7 +146,7 @@ stages: make tools-only_config envtools -j$(nproc) - job: utils - displayName: 'Run binman, buildman, dtoc and Kconfig testsuites' + displayName: 'Run binman, buildman, dtoc, Kconfig and qconfig testsuites' pool: vmImage: $(ubuntu_vm) container: @@ -176,6 +176,7 @@ stages: # Avoid "Permission denied: 'cov'" error by using a temporary file COVERAGE_FILE=/tmp/.coverage ./tools/binman/binman ${TOOLPATH} test -T ./tools/buildman/buildman -t + ./tools/qconfig.py -t ./tools/dtoc/dtoc -t make O=${UBOOT_TRAVIS_BUILD_DIR} testconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2716af1904..eb4636e22cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -206,7 +206,7 @@ Build allyesconfig, tools-only and envtools: make mrproper; make tools-only_config envtools -j$(nproc) -Run binman, buildman, dtoc and Kconfig testsuites: +Run binman, buildman, dtoc, Kconfig and qconfig testsuites: extends: .testsuites tags: - ${DEFAULT_AMD64_TAG} @@ -233,6 +233,7 @@ Run binman, buildman, dtoc and Kconfig testsuites: ./tools/binman/binman ${TOOLPATH} test; ./tools/binman/binman ${TOOLPATH} test -T; ./tools/buildman/buildman -t; + ./tools/qconfig.py -t; ./tools/dtoc/dtoc -t; make testconfig diff --git a/test/run b/test/run index 7c0263713c6..da9b5ba7012 100755 --- a/test/run +++ b/test/run @@ -83,6 +83,7 @@ run_test "binman" ./tools/binman/binman --toolpath ${TOOLS_DIR} test run_test "u_boot_pylib" ./tools/u_boot_pylib/u_boot_pylib run_test "buildman" ./tools/buildman/buildman -t ${skip} +run_test "qconfig" ./tools/qconfig.py -t run_test "fdt" ./tools/dtoc/test_fdt -t run_test "dtoc" ./tools/dtoc/dtoc -t -- 2.43.0
