mirror of https://github.com/xemu-project/xemu.git
tests/lcitool: fix up indentation to correct style
3 space indentation snuck into the initial commit. Clean it up before we let it get established. I've also: - removed unused os import - added double lines between functions - added some comments and grouped and sorted the generation stanzas My lint tool is also recommending using f-strings but that requires python 3.6. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Cc: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20220527153603.887929-6-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée
parent
85b141ea6a
commit
06885cf935
|
|
@ -13,14 +13,13 @@
|
||||||
# the top-level directory.
|
# the top-level directory.
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
if len(sys.argv) != 1:
|
if len(sys.argv) != 1:
|
||||||
print("syntax: %s" % sys.argv[0], file=sys.stderr)
|
print("syntax: %s" % sys.argv[0], file=sys.stderr)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
self_dir = Path(__file__).parent
|
self_dir = Path(__file__).parent
|
||||||
src_dir = self_dir.parent.parent
|
src_dir = self_dir.parent.parent
|
||||||
|
|
@ -30,76 +29,95 @@ lcitool_path = Path(self_dir, "libvirt-ci", "lcitool")
|
||||||
|
|
||||||
lcitool_cmd = [lcitool_path, "--data-dir", self_dir]
|
lcitool_cmd = [lcitool_path, "--data-dir", self_dir]
|
||||||
|
|
||||||
|
|
||||||
def atomic_write(filename, content):
|
def atomic_write(filename, content):
|
||||||
tmp = filename.with_suffix(filename.suffix + ".tmp")
|
tmp = filename.with_suffix(filename.suffix + ".tmp")
|
||||||
try:
|
try:
|
||||||
with tmp.open("w") as fp:
|
with tmp.open("w") as fp:
|
||||||
print(content, file=fp, end="")
|
print(content, file=fp, end="")
|
||||||
tmp.rename(filename)
|
tmp.rename(filename)
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
tmp.unlink()
|
tmp.unlink()
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
|
||||||
def generate(filename, cmd, trailer):
|
def generate(filename, cmd, trailer):
|
||||||
print("Generate %s" % filename)
|
print("Generate %s" % filename)
|
||||||
lcitool=subprocess.run(cmd, capture_output=True)
|
lcitool = subprocess.run(cmd, capture_output=True)
|
||||||
|
|
||||||
if lcitool.returncode != 0:
|
if lcitool.returncode != 0:
|
||||||
raise Exception("Failed to generate %s: %s" % (filename, lcitool.stderr))
|
raise Exception("Failed to generate %s: %s" % (filename, lcitool.stderr))
|
||||||
|
|
||||||
|
content = lcitool.stdout.decode("utf8")
|
||||||
|
if trailer is not None:
|
||||||
|
content += trailer
|
||||||
|
atomic_write(filename, content)
|
||||||
|
|
||||||
content = lcitool.stdout.decode("utf8")
|
|
||||||
if trailer is not None:
|
|
||||||
content += trailer
|
|
||||||
atomic_write(filename, content)
|
|
||||||
|
|
||||||
def generate_dockerfile(host, target, cross=None, trailer=None):
|
def generate_dockerfile(host, target, cross=None, trailer=None):
|
||||||
filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker")
|
filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker")
|
||||||
cmd = lcitool_cmd + ["dockerfile"]
|
cmd = lcitool_cmd + ["dockerfile"]
|
||||||
if cross is not None:
|
if cross is not None:
|
||||||
cmd.extend(["--cross", cross])
|
cmd.extend(["--cross", cross])
|
||||||
cmd.extend([target, "qemu"])
|
cmd.extend([target, "qemu"])
|
||||||
generate(filename, cmd, trailer)
|
generate(filename, cmd, trailer)
|
||||||
|
|
||||||
|
|
||||||
def generate_cirrus(target, trailer=None):
|
def generate_cirrus(target, trailer=None):
|
||||||
filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
|
filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
|
||||||
cmd = lcitool_cmd + ["variables", target, "qemu"]
|
cmd = lcitool_cmd + ["variables", target, "qemu"]
|
||||||
generate(filename, cmd, trailer)
|
generate(filename, cmd, trailer)
|
||||||
|
|
||||||
|
|
||||||
ubuntu2004_tsanhack = [
|
ubuntu2004_tsanhack = [
|
||||||
"# Apply patch https://reviews.llvm.org/D75820\n",
|
"# Apply patch https://reviews.llvm.org/D75820\n",
|
||||||
"# This is required for TSan in clang-10 to compile with QEMU.\n",
|
"# This is required for TSan in clang-10 to compile with QEMU.\n",
|
||||||
"RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n"
|
"RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n"
|
||||||
]
|
]
|
||||||
|
|
||||||
def debian_cross_build(prefix, targets):
|
|
||||||
conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix)
|
|
||||||
targets = "ENV DEF_TARGET_LIST %s\n" % (targets)
|
|
||||||
return "".join([conf, targets])
|
|
||||||
|
|
||||||
|
def debian_cross_build(prefix, targets):
|
||||||
|
conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix)
|
||||||
|
targets = "ENV DEF_TARGET_LIST %s\n" % (targets)
|
||||||
|
return "".join([conf, targets])
|
||||||
|
|
||||||
|
#
|
||||||
|
# Update all the various build configurations.
|
||||||
|
# Please keep each group sorted alphabetically for easy reading.
|
||||||
|
#
|
||||||
|
|
||||||
try:
|
try:
|
||||||
generate_dockerfile("centos8", "centos-stream-8")
|
#
|
||||||
generate_dockerfile("fedora", "fedora-35")
|
# Standard native builds
|
||||||
generate_dockerfile("ubuntu2004", "ubuntu-2004",
|
#
|
||||||
trailer="".join(ubuntu2004_tsanhack))
|
generate_dockerfile("alpine", "alpine-edge")
|
||||||
generate_dockerfile("opensuse-leap", "opensuse-leap-152")
|
generate_dockerfile("centos8", "centos-stream-8")
|
||||||
generate_dockerfile("alpine", "alpine-edge")
|
generate_dockerfile("fedora", "fedora-35")
|
||||||
|
generate_dockerfile("opensuse-leap", "opensuse-leap-152")
|
||||||
|
generate_dockerfile("ubuntu2004", "ubuntu-2004",
|
||||||
|
trailer="".join(ubuntu2004_tsanhack))
|
||||||
|
|
||||||
generate_dockerfile("debian-arm64-cross", "debian-11",
|
#
|
||||||
cross="aarch64",
|
# Cross compiling builds
|
||||||
trailer=debian_cross_build("aarch64-linux-gnu-",
|
#
|
||||||
"aarch64-softmmu,aarch64-linux-user"))
|
generate_dockerfile("debian-arm64-cross", "debian-11",
|
||||||
|
cross="aarch64",
|
||||||
|
trailer=debian_cross_build("aarch64-linux-gnu-",
|
||||||
|
"aarch64-softmmu,aarch64-linux-user"))
|
||||||
|
|
||||||
generate_dockerfile("debian-s390x-cross", "debian-11",
|
generate_dockerfile("debian-s390x-cross", "debian-11",
|
||||||
cross="s390x",
|
cross="s390x",
|
||||||
trailer=debian_cross_build("s390x-linux-gnu-",
|
trailer=debian_cross_build("s390x-linux-gnu-",
|
||||||
"s390x-softmmu,s390x-linux-user"))
|
"s390x-softmmu,s390x-linux-user"))
|
||||||
|
|
||||||
generate_cirrus("freebsd-12")
|
#
|
||||||
generate_cirrus("freebsd-13")
|
# Cirrus packages lists for GitLab
|
||||||
generate_cirrus("macos-11")
|
#
|
||||||
|
generate_cirrus("freebsd-12")
|
||||||
|
generate_cirrus("freebsd-13")
|
||||||
|
generate_cirrus("macos-11")
|
||||||
|
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
print(str(ex), file=sys.stderr)
|
print(str(ex), file=sys.stderr)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue