GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2019-11-06-reenable-llvm-in-ci'

Browse source 
- Re-enable LLVM tests in Travis and add them to GitLab and Azure
This commit is contained in:
Tom Rini 2019-11-06 22:54:47 -05:00
commit 416b5dd5f4
4 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.azure-pipelines.yml
View file

@ -149,6 +149,10 @@ jobs:
sandbox: sandbox:
TEST_PY_BD: "sandbox" TEST_PY_BD: "sandbox"
BUILDMAN: "^sandbox$" BUILDMAN: "^sandbox$"
sandbox_clang:
TEST_PY_BD: "sandbox"
BUILDMAN: "^sandbox$"
OVERRIDE: "-O clang-7"
sandbox_spl: sandbox_spl:
TEST_PY_BD: "sandbox_spl" TEST_PY_BD: "sandbox_spl"
TEST_PY_TEST_SPEC: "test_ofplatdata" TEST_PY_TEST_SPEC: "test_ofplatdata"
@ -238,6 +242,7 @@ jobs:
export TEST_PY_ID="${TEST_PY_ID}" export TEST_PY_ID="${TEST_PY_ID}"
export TEST_PY_TEST_SPEC="${TEST_PY_TEST_SPEC}" export TEST_PY_TEST_SPEC="${TEST_PY_TEST_SPEC}"
export BUILDMAN="${BUILDMAN}" export BUILDMAN="${BUILDMAN}"
export OVERRIDE="${OVERRIDE}"
EOF EOF
cat << "EOF" >> test.sh cat << "EOF" >> test.sh
# the below corresponds to .gitlab-ci.yml "before_script" # the below corresponds to .gitlab-ci.yml "before_script"

8
.gitlab-ci.yml
View file

@ -178,6 +178,14 @@ sandbox test.py:
BUILDMAN: "^sandbox$" BUILDMAN: "^sandbox$"
<<: *buildman_and_testpy_dfn <<: *buildman_and_testpy_dfn
sandbox with clang test.py:
tags: [ 'all' ]
variables:
TEST_PY_BD: "sandbox"
BUILDMAN: "^sandbox$"
OVERRIDE: "-O clang-7"
<<: *buildman_and_testpy_dfn
sandbox_spl test.py: sandbox_spl test.py:
tags: [ 'all' ] tags: [ 'all' ]
variables: variables:

2
.travis.yml
View file

@ -389,7 +389,7 @@ matrix:
env: env:
- TEST_PY_BD="sandbox" - TEST_PY_BD="sandbox"
BUILDMAN="^sandbox$" BUILDMAN="^sandbox$"
OVERRIDE="clang-7" OVERRIDE="-O clang-7"
- name: "test/py sandbox_spl" - name: "test/py sandbox_spl"
env: env:
- TEST_PY_BD="sandbox_spl" - TEST_PY_BD="sandbox_spl"

4
common/console.c
View file

@ -252,10 +252,12 @@ static void console_puts(int file, const char *s)
} }
} }
#if CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV)
static inline void console_doenv(int file, struct stdio_dev *dev) static inline void console_doenv(int file, struct stdio_dev *dev)
{ {
iomux_doenv(file, dev->name); iomux_doenv(file, dev->name);
} }
#endif
#else #else
static inline int console_getc(int file) static inline int console_getc(int file)
{ {
@ -283,10 +285,12 @@ static inline void console_puts(int file, const char *s)
stdio_devices[file]->puts(stdio_devices[file], s); stdio_devices[file]->puts(stdio_devices[file], s);
} }
#if CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV)
static inline void console_doenv(int file, struct stdio_dev *dev) static inline void console_doenv(int file, struct stdio_dev *dev)
{ {
console_setfile(file, dev); console_setfile(file, dev);
} }
#endif
#endif /* CONIFIG_IS_ENABLED(CONSOLE_MUX) */ #endif /* CONIFIG_IS_ENABLED(CONSOLE_MUX) */
/** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/ /** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/