[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/21] travis: standardize the syntax used for env va
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 09/21] travis: standardize the syntax used for env variables |
Date: |
Mon, 14 Jan 2019 15:01:17 +0000 |
From: Daniel P. Berrangé <address@hidden>
Matrix entries are defining env variables using two different syntax
styles:
- env: FOO=bar
WIZZ=bang
and
- env:
- FOO=bar
- WIZZ=bang
Switch everything to use the latter style as the more normal indentation
approach.
Signed-off-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/.travis.yml b/.travis.yml
index 96917df9c5..f539f8b556 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,102 +81,123 @@ script:
matrix:
include:
- - env: CONFIG="--disable-system"
+ - env:
+ - CONFIG="--disable-system"
- - env: CONFIG="--disable-user"
+ - env:
+ - CONFIG="--disable-user"
- - env: CONFIG="--enable-debug --enable-debug-tcg"
+ - env:
+ - CONFIG="--enable-debug --enable-debug-tcg"
- - env: CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr
--disable-brlapi --disable-uuid --disable-libusb --disable-user"
+ - env:
+ - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr
--disable-brlapi --disable-uuid --disable-libusb --disable-user"
- - env: CONFIG="--enable-modules --disable-linux-user"
+ - env:
+ - CONFIG="--enable-modules --disable-linux-user"
- - env: CONFIG="--with-coroutine=ucontext --disable-linux-user"
+ - env:
+ - CONFIG="--with-coroutine=ucontext --disable-linux-user"
- - env: CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
+ - env:
+ - CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
# Test out-of-tree builds
- - env: CONFIG="--enable-debug --enable-debug-tcg"
- BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."
+ - env:
+ - CONFIG="--enable-debug --enable-debug-tcg"
+ - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."
# Test with Clang for compile portability (Travis uses clang-5.0)
- - env: CONFIG="--disable-system"
+ - env:
+ - CONFIG="--disable-system"
compiler: clang
- - env: CONFIG="--disable-user"
+ - env:
+ - CONFIG="--disable-user"
compiler: clang
# gprof/gcov are GCC features
- - env: CONFIG="--enable-gprof --enable-gcov --disable-pie
--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
+ - env:
+ - CONFIG="--enable-gprof --enable-gcov --disable-pie
--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
after_success:
- ${SRC_DIR}/scripts/travis/coverage-summary.sh
compiler: gcc
# We manually include builds which we disable "make check" for
- - env: CONFIG="--enable-debug --enable-tcg-interpreter"
- TEST_CMD=""
+ - env:
+ - CONFIG="--enable-debug --enable-tcg-interpreter"
+ - TEST_CMD=""
compiler: gcc
# We don't need to exercise every backend with every front-end
- - env: CONFIG="--enable-trace-backends=log,simple,syslog --disable-system"
- TEST_CMD=""
+ - env:
+ - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system"
+ - TEST_CMD=""
compiler: gcc
- - env: CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu"
- TEST_CMD=""
+ - env:
+ - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu"
+ - TEST_CMD=""
compiler: gcc
- - env: CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu"
- TEST_CMD=""
+ - env:
+ - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu"
+ - TEST_CMD=""
compiler: gcc
- - env: CONFIG="--disable-tcg"
- TEST_CMD=""
+ - env:
+ - CONFIG="--disable-tcg"
+ - TEST_CMD=""
compiler: gcc
# MacOSX builds
- - env:
CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
+ - env:
+ -
CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
os: osx
osx_image: xcode9.4
compiler: clang
- - env:
CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"
+ - env:
+ -
CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"
os: osx
osx_image: xcode10
compiler: clang
# Python builds
- - env: CONFIG="--target-list=x86_64-softmmu"
+ - env:
+ - CONFIG="--target-list=x86_64-softmmu"
python:
- "3.0"
- - env: CONFIG="--target-list=x86_64-softmmu"
+ - env:
+ - CONFIG="--target-list=x86_64-softmmu"
python:
- "3.6"
# Acceptance (Functional) tests
- - env: CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu"
- TEST_CMD="make AVOCADO_SHOW=app check-acceptance"
+ - env:
+ - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu"
+ - TEST_CMD="make AVOCADO_SHOW=app check-acceptance"
addons:
apt:
packages:
--
2.17.1
- [Qemu-devel] [PULL 00/21] misc testing fixes for Travis and docker, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 03/21] tests: remove obsolete 'debian' dockerfile, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 06/21] tests: use in-place sed magic for enabling deb-src in travis image, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 04/21] tests: update Fedora dockerfile to use Fedora 29, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 07/21] travis: add whitespace between each major section & matrix entry, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 01/21] docker: Use stable git tag for virglrenderer, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 05/21] tests: update Fedora i386 cross image to Fedora 29, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 08/21] travis: define all the build matrix entries in one place, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 20/21] tests: use g_usleep instead of rem = sleep(time), Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 09/21] travis: standardize the syntax used for env variables,
Alex Bennée <=
- [Qemu-devel] [PULL 15/21] travis: remove matrix settings that duplicate global settings, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 10/21] travis: don't clone git submodules upfront, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 02/21] tests: run ldconfig after installing extra software, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 12/21] travis: stop redefining the script commands, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 19/21] tests/docker: remove SID_AGE test hack, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 14/21] travis: run tests in verbose mode, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 18/21] tests/docker: update our Travis image, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 13/21] travis: stop using container based envs, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 21/21] Revert "tests: Disable qht-bench parallel test when using gprof", Alex Bennée, 2019/01/14