Skip to content
Snippets Groups Projects
Commit 43a68e49 authored by Stephen Warren's avatar Stephen Warren Committed by Tom Rini
Browse files

travis-ci: Use = not : when writing ~/.buildman


Travis CI seems to be confused when there's a colon in an echo command,
and this is currently worked around using a variable that contains the
text we want to echo. Use = syntax instead so that we can remove the
work-around; it's rather confusing until you find out what it's for.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Reviewed-by: default avatarHeiko Schocher <hs@denx.de>
parent f57146a8
No related branches found
No related tags found
No related merge requests found
...@@ -38,8 +38,7 @@ install: ...@@ -38,8 +38,7 @@ install:
- ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname` - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname`
- ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname`
# prepare buildman environment # prepare buildman environment
- export BUILDMAN_ROOT="root:" - echo -e "[toolchain]\nroot = /usr" > ~/.buildman
- echo -e "[toolchain]\n${BUILDMAN_ROOT} /usr" > ~/.buildman
- echo -e "\n[toolchain-alias]\nblackfin = bfin\nsh = sh4\nopenrisc = or32" >> ~/.buildman - echo -e "\n[toolchain-alias]\nblackfin = bfin\nsh = sh4\nopenrisc = or32" >> ~/.buildman
- cat ~/.buildman - cat ~/.buildman
- virtualenv /tmp/venv - virtualenv /tmp/venv
...@@ -105,8 +104,7 @@ matrix: ...@@ -105,8 +104,7 @@ matrix:
- BUILDMAN="sandbox x86" - BUILDMAN="sandbox x86"
TOOLCHAIN="x86_64" TOOLCHAIN="x86_64"
script: script:
- export BUILDMAN_X86="x86:"; - echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman
echo -e "\n[toolchain-prefix]\n${BUILDMAN_X86} ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman
- env: - env:
- BUILDMAN="kirkwood" - BUILDMAN="kirkwood"
- env: - env:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment