Message ID | 20200224180541.3654-5-trini@konsulko.com |
---|---|
State | Superseded |
Headers | show |
Series | [1/7] misc: Add more -I$(objtree)/$(obj) lines | expand |
On Tue, Feb 25, 2020 at 3:06 AM Tom Rini <trini at konsulko.com> wrote: > > 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 at konsulko.com> Reviewed-by: Masahiro Yamada <masahiroy at kernel.org> > --- > .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 c22095830c0c..89aa5e46e298 100644 > --- a/.azure-pipelines.yml > +++ b/.azure-pipelines.yml > @@ -110,7 +110,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: > @@ -125,7 +125,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} > @@ -134,6 +134,7 @@ jobs: > ./tools/buildman/buildman -t > ./tools/dtoc/dtoc -t > ./tools/patman/patman --test > + make 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 d486e72042fb..87231a039b48 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -150,7 +150,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: > @@ -159,7 +159,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}"; > @@ -167,7 +167,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 e6db9d6a721a..53e4c2c12671 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -150,7 +150,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 > > -- > 2.17.1 >
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index c22095830c0c..89aa5e46e298 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -110,7 +110,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: @@ -125,7 +125,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} @@ -134,6 +134,7 @@ jobs: ./tools/buildman/buildman -t ./tools/dtoc/dtoc -t ./tools/patman/patman --test + make 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 d486e72042fb..87231a039b48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,7 +150,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: @@ -159,7 +159,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}"; @@ -167,7 +167,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 e6db9d6a721a..53e4c2c12671 100644 --- a/.travis.yml +++ b/.travis.yml @@ -150,7 +150,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
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 at konsulko.com> --- .azure-pipelines.yml | 5 +++-- .gitlab-ci.yml | 7 ++++--- .travis.yml | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-)