[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] docker: Fix travis.py parser and misc change
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 7/9] docker: Fix travis.py parser and misc change |
Date: |
Mon, 25 Mar 2019 13:20:07 +0000 |
From: Wainer dos Santos Moschetta <address@hidden>
Fixed the travis.py script that has failed to parse the current
QEMU_SRC/.travis.yml file. It no longer makes combinations from
env/matrix, instead it uses explicit includes. Also the compiler
can be omitted from matrix/include, so that Travis chooses the
first entry of the global compiler list.
Replaced yaml.load() with yaml.safe_load() so that quieting the
following deprecation warning:
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation
Signed-off-by: Wainer dos Santos Moschetta <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/docker/travis.py b/tests/docker/travis.py
index ea1ef169e6..e1433012bd 100755
--- a/tests/docker/travis.py
+++ b/tests/docker/travis.py
@@ -17,18 +17,17 @@ import yaml
import itertools
def load_yaml(fname):
- return yaml.load(open(fname, "r").read())
+ return yaml.safe_load(open(fname, "r").read())
def conf_iter(conf):
+ # If "compiler" is omitted from the included env then Travis picks the
+ # first entry of the global compiler list.
+ default_compiler = conf["compiler"][0]
def env_to_list(env):
return env if isinstance(env, list) else [env]
for entry in conf["matrix"]["include"]:
yield {"env": env_to_list(entry["env"]),
- "compiler": entry["compiler"]}
- for entry in itertools.product(conf["compiler"],
- conf["env"]["matrix"]):
- yield {"env": env_to_list(entry[1]),
- "compiler": entry[0]}
+ "compiler": entry.get("compiler", default_compiler)}
def main():
if len(sys.argv) < 2:
--
2.20.1
- [Qemu-devel] [PULL 0/9 for 4.0] fpu and testing fixes, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 1/9] configure: add --target-list-exclude, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 3/9] .travis.yml: --disable-user for --without-default-devices, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 2/9] .travis.yml: split some more system builds, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 4/9] .travis.yml: reduce number of targets built while disabling things, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 7/9] docker: Fix travis.py parser and misc change,
Alex Bennée <=
- [Qemu-devel] [PULL 6/9] hardfloat: fix float32/64 fused multiply-add, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 5/9] target/mips: Fix minor bug in FPU, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 8/9] docker: Fix travis script unable to find source dir, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 9/9] docker: trivial changes to `make docker` help, Alex Bennée, 2019/03/25
- Re: [Qemu-devel] [PULL 0/9 for 4.0] fpu and testing fixes, Peter Maydell, 2019/03/25