From edc49f5ccc2c06f2b06397a293f38a6c051fd871 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 11 Feb 2020 17:15:19 -0700 Subject: [PATCH] Revert "gitlab: Disable SDL when building sandbox" This is not needed now that we have SDL2 in the docker image. It causes test failures for tests which need video to work. This reverts commit 29c4429fbb4f981f8ee7558e179f6082ed38cdb2. Signed-off-by: Simon Glass --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f8a4c93cf..e20a789ac1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,8 +31,7 @@ stages: # use clang only do one configuration. - if [[ "${BUILDMAN}" != "" ]]; then ret=0; - NO_SDL=1 tools/buildman/buildman -o /tmp -P -E ${BUILDMAN} - ${OVERRIDE}|| ret=$?; + tools/buildman/buildman -o /tmp -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?; if [[ $ret -ne 0 && $ret -ne 129 ]]; then tools/buildman/buildman -o /tmp -sdeP ${BUILDMAN}; exit $ret; @@ -164,7 +163,7 @@ Run binman, buildman, dtoc and patman testsuites: 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}"; - NO_SDL=1 ./tools/buildman/buildman -o /tmp -P sandbox_spl; + ./tools/buildman/buildman -o /tmp -P sandbox_spl; ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test; ./tools/buildman/buildman -t; ./tools/dtoc/dtoc -t; -- 2.39.5