colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c64911207f1d3add9bc68d85df7d66505b530761..badfcb4254ed2c2079826a8d30d5c84f6e91a158 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 
 # Grab our configured image.  The source for this is found at:
 # https://gitlab.denx.de/u-boot/gitlab-ci-runner
 
 # Grab our configured image.  The source for this is found at:
 # https://gitlab.denx.de/u-boot/gitlab-ci-runner

-image: trini/u-boot-gitlab-ci-runner:bionic-20200311-10Apr2020
+image: trini/u-boot-gitlab-ci-runner:bionic-20200403-27Apr2020

 
 # We run some tests in different order, to catch some failures quicker.
 stages:
 
 # We run some tests in different order, to catch some failures quicker.
 stages:


@@ -38,14 +38,8 @@ stages:
   script:
     # If we've been asked to use clang only do one configuration.
     - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD}
   script:
     # If we've been asked to use clang only do one configuration.
     - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD}

-    - ret=0;
-      tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W
-        --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
-      if [[ $ret -ne 0 ]]; then
-        tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -se
-           --board ${TEST_PY_BD};
-        exit $ret;
-      fi
+    - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e
+        --board ${TEST_PY_BD} ${OVERRIDE}

     - virtualenv -p /usr/bin/python3 /tmp/venv
     - . /tmp/venv/bin/activate
     - pip install -r test/py/requirements.txt
     - virtualenv -p /usr/bin/python3 /tmp/venv
     - . /tmp/venv/bin/activate
     - pip install -r test/py/requirements.txt


@@ -109,7 +103,7 @@ cppcheck:
   tags: [ 'all' ]
   stage: testsuites
   script:
   tags: [ 'all' ]
   stage: testsuites
   script:

-    - cppcheck --force --quiet --inline-suppr .
+    - cppcheck -j$(nproc) --force --quiet --inline-suppr .

 
 # search for TODO within source tree
 grep TODO/FIXME/HACK:
 
 # search for TODO within source tree
 grep TODO/FIXME/HACK:


@@ -176,6 +170,14 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites:
       ./tools/patman/patman --test;
       make testconfig
 
       ./tools/patman/patman --test;
       make testconfig
 

+Run tests for Nokia RX-51 (aka N900):
+  tags: [ 'all' ]
+  stage: testsuites
+  script:
+    - ./tools/buildman/buildman --fetch-arch arm;
+      export PATH=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/:$PATH;
+      test/nokia_rx51_test.sh
+

 # Test sandbox with test.py
 sandbox test.py:
   tags: [ 'all' ]
 # Test sandbox with test.py
 sandbox test.py:
   tags: [ 'all' ]


@@ -187,7 +189,7 @@ sandbox with clang test.py:
   tags: [ 'all' ]
   variables:
     TEST_PY_BD: "sandbox"
   tags: [ 'all' ]
   variables:
     TEST_PY_BD: "sandbox"

-    OVERRIDE: "-O clang-7"
+    OVERRIDE: "-O clang-10"

   <<: *buildman_and_testpy_dfn
 
 sandbox_spl test.py:
   <<: *buildman_and_testpy_dfn
 
 sandbox_spl test.py: