From de536614f4c1b89cf38ce9039869eebe6ddd7ded Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Wed, 23 Dec 2020 14:55:20 +0800 Subject: [PATCH 1/2] makepkg.yaml: add qemu_san_branch configuration item Add qemu_san_branch configration item to set up the qemu branch that need to compiled Signed-off-by: Ke Zhiming --- jobs/virttest-makepkg.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jobs/virttest-makepkg.yaml b/jobs/virttest-makepkg.yaml index be33e11..7dc05a4 100644 --- a/jobs/virttest-makepkg.yaml +++ b/jobs/virttest-makepkg.yaml @@ -1,8 +1,14 @@ suite: cci-makepkg category: functional -# if you need to run integration tests on qemu_san version, enable it in makepkg +# If you need to run integration tests on qemu_san version, enable it in makepkg, +# No set, it gets disable #qemu_san: enable + +# You can checkout specified branch by setting qemu_san_branch. No set, it gets master. +# Value range is the branch of https://gitee.com/src-openeuler/qemu.git. +# Takes effect when qemu_san is enable +#qemu_san_branch: master cci-makepkg: benchmark: virttest -- Gitee From 1b6cfbe34f157f9251f2b571fbc858cbf9cce074 Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Wed, 23 Dec 2020 14:59:27 +0800 Subject: [PATCH 2/2] PKGBUILD: qemu_san can be rebuild with the branch of qemu_san_branch Qemu_san can be rebuild with the branch of qemu_san_branch, the one set in makepkg.yaml Signed-off-by: Ke Zhiming --- pkg/virttest/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/virttest/PKGBUILD b/pkg/virttest/PKGBUILD index 13b0cff..4d32ab2 100644 --- a/pkg/virttest/PKGBUILD +++ b/pkg/virttest/PKGBUILD @@ -52,6 +52,7 @@ qemu_asan_build() { fi [ -d $rpm_source_dir ] && rm -rf $rpm_source_dir mkdir -p $rpm_source_dir + [ ! -z "$qemu_san_branch" ] && cd ${srcdir}/qemu/ && git checkout -f $qemu_san_branch cp -a ${srcdir}/qemu/* $rpm_source_dir qemu_spec=${srcdir}/qemu/qemu.spec sed -i '/--python=/a \ --enable-sanitizers \\' ${qemu_spec} -- Gitee