summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-02-11 17:15:19 -0700
committerTom Rini <trini@konsulko.com>2020-02-12 08:05:54 -0500
commit26d4d77035d20364afc08c3098581a638b4edda8 (patch)
tree9a285ae789dc52176924eca4883a2ede7ed4d169
parent9a8942b53d57149754e0dfc975e0d92d1afd4087 (diff)
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 af800722eb718bec51c5943cfb69231acf15178f. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--.gitlab-ci.yml5
1 files 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;