diff mbox series

Revert "gitlab: Disable SDL when building sandbox"

Message ID 20200212001520.35391-1-sjg@chromium.org
State Accepted
Commit 26d4d77035d20364afc08c3098581a638b4edda8
Headers show
Series Revert "gitlab: Disable SDL when building sandbox" | expand

Commit Message

Simon Glass Feb. 12, 2020, 12:15 a.m. UTC 
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 af800722eb718bec51c5943cfb69231acf15178f.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Tom Rini Feb. 12, 2020, 1:06 p.m. UTC | #1 
On Tue, Feb 11, 2020 at 05:15:19PM -0700, Simon Glass wrote:

> 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 af800722eb718bec51c5943cfb69231acf15178f.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

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;