diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-06 22:54:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-06 22:54:47 -0500 |
| commit | 416b5dd5f4dd4e8634f526f4a77b6b66fb6d1843 (patch) | |
| tree | b49e2f218b642b3739540bcdf8bd974c5a12cc6a | |
| parent | 0f282c1876af26cc2c8c018ae6293a691561011e (diff) | |
| parent | 0219d014a781e4b79f9889a479f9b3782d76aeff (diff) | |
| download | u-boot-WIP/06Nov2019.tar.gz | |
Merge branch '2019-11-06-reenable-llvm-in-ci'WIP/06Nov2019
- Re-enable LLVM tests in Travis and add them to GitLab and Azure
| -rw-r--r-- | .azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | common/console.c | 4 |
4 files changed, 18 insertions, 1 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 862cced1cc..44a76ebb09 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -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" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b295ac710..0f5271dcd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/.travis.yml b/.travis.yml index 1e98378695..f6aec96770 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/common/console.c b/common/console.c index 89b1e9590c..168ba60d0d 100644 --- a/common/console.c +++ b/common/console.c @@ -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 *************************/ |