mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
Merge branch '2019-11-06-reenable-llvm-in-ci'
- Re-enable LLVM tests in Travis and add them to GitLab and Azure
This commit is contained in:
commit
416b5dd5f4
4 changed files with 18 additions and 1 deletions
|
@ -149,6 +149,10 @@ jobs:
|
|||
sandbox:
|
||||
TEST_PY_BD: "sandbox"
|
||||
BUILDMAN: "^sandbox$"
|
||||
sandbox_clang:
|
||||
TEST_PY_BD: "sandbox"
|
||||
BUILDMAN: "^sandbox$"
|
||||
OVERRIDE: "-O clang-7"
|
||||
sandbox_spl:
|
||||
TEST_PY_BD: "sandbox_spl"
|
||||
TEST_PY_TEST_SPEC: "test_ofplatdata"
|
||||
|
@ -238,6 +242,7 @@ jobs:
|
|||
export TEST_PY_ID="${TEST_PY_ID}"
|
||||
export TEST_PY_TEST_SPEC="${TEST_PY_TEST_SPEC}"
|
||||
export BUILDMAN="${BUILDMAN}"
|
||||
export OVERRIDE="${OVERRIDE}"
|
||||
EOF
|
||||
cat << "EOF" >> test.sh
|
||||
# the below corresponds to .gitlab-ci.yml "before_script"
|
||||
|
|
|
@ -178,6 +178,14 @@ sandbox test.py:
|
|||
BUILDMAN: "^sandbox$"
|
||||
<<: *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:
|
||||
tags: [ 'all' ]
|
||||
variables:
|
||||
|
|
|
@ -389,7 +389,7 @@ matrix:
|
|||
env:
|
||||
- TEST_PY_BD="sandbox"
|
||||
BUILDMAN="^sandbox$"
|
||||
OVERRIDE="clang-7"
|
||||
OVERRIDE="-O clang-7"
|
||||
- name: "test/py sandbox_spl"
|
||||
env:
|
||||
- TEST_PY_BD="sandbox_spl"
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
iomux_doenv(file, dev->name);
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
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);
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV)
|
||||
static inline void console_doenv(int file, struct stdio_dev *dev)
|
||||
{
|
||||
console_setfile(file, dev);
|
||||
}
|
||||
#endif
|
||||
#endif /* CONIFIG_IS_ENABLED(CONSOLE_MUX) */
|
||||
|
||||
/** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/
|
||||
|
|
Loading…
Reference in a new issue