jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

docker: Fix travis.py parser and misc change

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 <wainersm@redhat.com>
Message-Id: <20190320221207.11366-2-wainersm@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

authored by

Wainer dos Santos Moschetta and committed by
Alex Bennée e8ced681 896f51fb

+5 -6
+5 -6
tests/docker/travis.py
··· 17 17 import itertools 18 18 19 19 def load_yaml(fname): 20 - return yaml.load(open(fname, "r").read()) 20 + return yaml.safe_load(open(fname, "r").read()) 21 21 22 22 def conf_iter(conf): 23 + # If "compiler" is omitted from the included env then Travis picks the 24 + # first entry of the global compiler list. 25 + default_compiler = conf["compiler"][0] 23 26 def env_to_list(env): 24 27 return env if isinstance(env, list) else [env] 25 28 for entry in conf["matrix"]["include"]: 26 29 yield {"env": env_to_list(entry["env"]), 27 - "compiler": entry["compiler"]} 28 - for entry in itertools.product(conf["compiler"], 29 - conf["env"]["matrix"]): 30 - yield {"env": env_to_list(entry[1]), 31 - "compiler": entry[0]} 30 + "compiler": entry.get("compiler", default_compiler)} 32 31 33 32 def main(): 34 33 if len(sys.argv) < 2: