From bd95c7c299dd5a2717dff740a73c941f67f0c121 Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Fri, 18 Dec 2020 14:54:43 +0800
Subject: [PATCH 1/2] virttest-makepkg: add qemu asan configuration item

1. Format adjustment
2. Add qemu asan configuration item to makepkg jobyaml

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 jobs/virttest-makepkg.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jobs/virttest-makepkg.yaml b/jobs/virttest-makepkg.yaml
index 7183c06..be33e11 100644
--- a/jobs/virttest-makepkg.yaml
+++ b/jobs/virttest-makepkg.yaml
@@ -1,5 +1,8 @@
 suite: cci-makepkg
 category: functional
 
+# if you need to run integration tests on qemu_san version, enable it in makepkg
+#qemu_san: enable
+
 cci-makepkg:
-        benchmark: virttest
+    benchmark: virttest
-- 
Gitee


From dcb97de63431a12ab524d41f838382419acc3c48 Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Fri, 18 Dec 2020 14:59:23 +0800
Subject: [PATCH 2/2] PKGBUILD: pkgbuild add qemu san rpm

PKGBUILD add qemu pkg which rpmbuild with sanitizers

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 pkg/virttest/PKGBUILD | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/pkg/virttest/PKGBUILD b/pkg/virttest/PKGBUILD
index e2a0b12..13b0cff 100644
--- a/pkg/virttest/PKGBUILD
+++ b/pkg/virttest/PKGBUILD
@@ -7,6 +7,12 @@ license=('GPL' 'GPL' 'GPL' 'GPL' 'GPL')
 source=("https://gitee.com/openeuler/avocado.git" "https://gitee.com/openeuler/avocado-vt.git" "https://gitee.com/openeuler/tp-qemu.git" "https://gitee.com/openeuler/tp-libvirt.git" "https://gitee.com/openeuler/EulerRobot.git")
 md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') 
 
+if [ x$qemu_san == x"enable" ]; then
+    source=(${source[*]} "https://gitee.com/src-openeuler/qemu.git")
+    license=(${license[*]} 'GPL')
+    md5sums=(${md5sums[*]} 'SKIP')
+fi
+
 install_virttest() {
     local branch=$1
 
@@ -38,8 +44,31 @@ install_virttest() {
     avocado vt-bootstrap --vt-type libvirt --vt-skip-verify-download-assets --yes-to-all
 }
 
+qemu_asan_build() {
+    rpm_source_dir="/root/rpmbuild/SOURCES"
+
+    if ! rpm -q rpm-build > /dev/null 2>&1; then
+            yum install -y rpm-build || exit $?
+    fi
+    [ -d $rpm_source_dir ] && rm -rf $rpm_source_dir
+    mkdir -p $rpm_source_dir
+    cp -a ${srcdir}/qemu/* $rpm_source_dir
+    qemu_spec=${srcdir}/qemu/qemu.spec
+    sed -i '/--python=/a \    --enable-sanitizers \\' ${qemu_spec}
+    sed -i 's/^make check/# &/' ${qemu_spec}
+    sed -i 's/^make %{_smp_mflags} \$buildldflags/make -j 60 \$buildldflags/' ${qemu_spec}
+
+    sed -i 's/^%__check_files/# &/' /usr/lib/rpm/macros
+
+    yum builddep -y ${qemu_spec} || exit $?
+    rpmbuild -ba ${qemu_spec} || exit $?
+}
+
 build() {
     install_virttest "openEuler-20.03"
+    if [ x$qemu_san == x"enable" ]; then
+        qemu_asan_build
+    fi
 }
 
 avocado_copy() {
@@ -69,7 +98,16 @@ lkp_virttest_copy() {
     cp -rf "${srcdir}/EulerRobot/config/vmxml/"* "${pkgdir}/${LKP_SRC}/virttest/"
 }
 
+san_rpm_copy() {
+    mkdir -p "${pkgdir}/virttest_san_rpm/"
+    cp -rf "/root/rpmbuild/RPMS/aarch64/"* "${pkgdir}/virttest_san_rpm/"
+    cp -rf "/root/rpmbuild/RPMS/noarch/"* "${pkgdir}/virttest_san_rpm/"
+}
+
 package() {
     lkp_virttest_copy
     avocado_copy
+    if [ x$qemu_san == x"enable" ]; then
+        san_rpm_copy
+    fi
 }
-- 
Gitee