From nobody Sun May 5 11:21:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1658995166; cv=none; d=zohomail.com; s=zohoarc; b=j5TGn2sBeBXMJBgaG49Uj2/DHnJH4WKgDCpnLyxGQjELYC22PU6D8JGLiT9rD4tqjIYIeGngvOsnvR23vL+MoVSS4/akc253Hd2PR32X4HgC/8w/S4wyMrm/s6enFoeHjMIpVw4zyitKJfp/ZjQoS288eX4NMANvhrXwxpZIJyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658995166; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kwgwn4nxDPHONxfpv9ST7ryL+LvQhvZMH1dAza0ugw4=; b=KDqVXpjTfvpFZMfvDqzEP2wRIGYpzwqJ3T/WNfPXQCFEB/iQVNJ5gfZR9N6cpmnMrHAp1F/faQCXyEu71mRRPPsjfFY+IcSrbHQ75QSqNywl1QnDd/G/nbg3bkQ/ryw0320Y0LuFBFZeYqYlgGtKMMzLMqqmmiED8FD9iXaSHOw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658995166811419.73132273599697; Thu, 28 Jul 2022 00:59:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.376666.609596 (Exim 4.92) (envelope-from ) id 1oGyQD-0005kn-N7; Thu, 28 Jul 2022 07:59:05 +0000 Received: by outflank-mailman (output) from mailman id 376666.609596; Thu, 28 Jul 2022 07:59:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGyQD-0005ke-Jp; Thu, 28 Jul 2022 07:59:05 +0000 Received: by outflank-mailman (input) for mailman id 376666; Thu, 28 Jul 2022 07:59:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGyQC-0005ej-ER for xen-devel@lists.xenproject.org; Thu, 28 Jul 2022 07:59:04 +0000 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [2a00:1450:4864:20::530]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 258a63fd-0e4b-11ed-924f-1f966e50362f; Thu, 28 Jul 2022 09:59:03 +0200 (CEST) Received: by mail-ed1-x530.google.com with SMTP id z18so1137421edb.10 for ; Thu, 28 Jul 2022 00:59:03 -0700 (PDT) Received: from uni.router.wind (adsl-69.109.242.233.tellas.gr. [109.242.233.69]) by smtp.googlemail.com with ESMTPSA id l2-20020a1709060cc200b00722e4bab163sm105413ejh.200.2022.07.28.00.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jul 2022 00:59:02 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 258a63fd-0e4b-11ed-924f-1f966e50362f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kwgwn4nxDPHONxfpv9ST7ryL+LvQhvZMH1dAza0ugw4=; b=jxd1jcy1EJS/n1CrAeDDR7rQZpPPusX//xpWTC0F4BeuwvRVdc96VHQ/vETtXAd7fQ k/ElpAHARj+YsIDek8vlqt3KmJoasOVWfrK2oBeCMC9qsq3uA6zfa1Kk8DpZgxCB7Rsz 3vmhMt7Zi7gt2JLJpW0yCEnT6Q5dFeCdiZaOGah3LgfYGUsqmCk/ExewOIblISlKvpFW xLVdJS2RcpdWbNk4ZxxiYnAKcjYR8ZqDQtEQwshQGCERy9U2dcalrwjZD+rug2hXydc0 99Q2hpJbI0+l412uDyKuEjTGycIr3GMsqOSkzDfivGpbTfAtVwoMXaZ5SPXx+2Di9gUu bWEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kwgwn4nxDPHONxfpv9ST7ryL+LvQhvZMH1dAza0ugw4=; b=du5T5MO4rvSS4o+rHOLbXlnNERPIY41LVcaxYeIaigo3gx/YmPFlofRV8WE11VYKbL GpTYW5k/cLzynEoosLRY1FBPL62YTNT1h+R4wcN+h++XJwyCTtE6HMGKlxVTrQrBGRCz Y6s2R24pSYc4N7WuS3/o8DiwrF6r/bBBiyUkfsBN74iq1uIBww1nNGBYBw6P9uQRKEfO giABT1zrmA1C9NAuZSxTTEY6lsBPKJJkyliuSsgeoJYh6doZaMAAFU3BtbyIlLC53nNn TUgxOiTztY9E7GATwGQPe0YU9P1PPdt8L420CW4IcmthUUIbNyBD/eJ2YWtaMOCobjgP RG3Q== X-Gm-Message-State: AJIora+oIJiMuxtr3X1woM7quEouCIHDQcwjqq6a7xyKDk86hRnR4gZC 6NZo3mUIZs/EtoWJUxx2pZBv3/6UCrg= X-Google-Smtp-Source: AGRyM1txKVD4jrGj5FhdZ0+s6cFNOSlkkgdZ1++x7l43ZviyW333xQ9oQT6rQ0X/+6NCfXUHh4h9cQ== X-Received: by 2002:a05:6402:194d:b0:43b:f21b:e9f4 with SMTP id f13-20020a056402194d00b0043bf21be9f4mr20274505edz.180.1658995142575; Thu, 28 Jul 2022 00:59:02 -0700 (PDT) From: Xenia Ragiadakou To: xen-devel@lists.xenproject.org Cc: Doug Goldstein , Stefano Stabellini Subject: [PATCH v3 1/2] automation: Remove XEN_CONFIG_EXPERT leftovers Date: Thu, 28 Jul 2022 10:58:55 +0300 Message-Id: <20220728075856.1175504-2-burzalodowa@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220728075856.1175504-1-burzalodowa@gmail.com> References: <20220728075856.1175504-1-burzalodowa@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1658995167204100001 Content-Type: text/plain; charset="utf-8" The EXPERT config option cannot anymore be selected via the environmental variable XEN_CONFIG_EXPERT. Remove stale references to XEN_CONFIG_EXPERT from the automation code. Signed-off-by: Xenia Ragiadakou Reviewed-by: Stefano Stabellini --- Changes in v2: - add Stefano's R-b tag Changes in v3: - none automation/build/README.md | 3 --- automation/scripts/build | 4 ++-- automation/scripts/containerize | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/automation/build/README.md b/automation/build/README.md index 2137957408..00305eed03 100644 --- a/automation/build/README.md +++ b/automation/build/README.md @@ -65,9 +65,6 @@ understands. - CONTAINER_NO_PULL: If set to 1, the script will not pull from docker hub. This is useful when testing container locally. =20 -- XEN_CONFIG_EXPERT: If this is defined in your shell it will be - automatically passed through to the container. - If your docker host has Linux kernel > 4.11, and you want to use containers that run old glibc (for example, CentOS 6 or SLES11SP4), you may need to a= dd =20 diff --git a/automation/scripts/build b/automation/scripts/build index 281f8b1fcc..21b3bc57c8 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -91,6 +91,6 @@ for cfg in `ls ${cfg_dir}`; do echo "Building $cfg" make -j$(nproc) -C xen clean rm -f xen/.config - make -C xen KBUILD_DEFCONFIG=3D../../../../${cfg_dir}/${cfg} XEN_CONFI= G_EXPERT=3Dy defconfig - make -j$(nproc) -C xen XEN_CONFIG_EXPERT=3Dy + make -C xen KBUILD_DEFCONFIG=3D../../../../${cfg_dir}/${cfg} defconfig + make -j$(nproc) -C xen done diff --git a/automation/scripts/containerize b/automation/scripts/container= ize index 8992c67278..9d4beca4fa 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -101,7 +101,6 @@ exec ${docker_cmd} run \ -v "${CONTAINER_PATH}":/build:rw${selinux} \ -v "${HOME}/.ssh":/root/.ssh:ro \ ${SSH_AUTH_DIR:+-v "${SSH_AUTH_DIR}":/tmp/ssh-agent${selinux}} \ - ${XEN_CONFIG_EXPERT:+-e XEN_CONFIG_EXPERT=3D${XEN_CONFIG_EXPERT}} \ ${CONTAINER_ARGS} \ -${termint}i --rm -- \ ${CONTAINER} \ --=20 2.34.1 From nobody Sun May 5 11:21:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1658995172; cv=none; d=zohomail.com; s=zohoarc; b=ACB+n2zgZdXXD58utOYyAYfcVuMeKYxHuVtzFfdYBBu4WsiS5Rx5NPZoRcOG6MVLuLEdwoNGNOswJMZExMBo4pu2DbMpdQQNwVWq7ISwZMVDqJMHbBrZMuc3KfKQD8Bh70HYVPfmweh3Zs6fc6XGG2lqReUN7pr9qi85PIyCUtw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658995172; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/yzGIK2WwUM9PEPFz0+ZahCjAacTI+5nDzYSTopw8Ts=; b=HkMCgxv+GBeSr3vwu7zDSxraFRAv8DCPid6Y+myZ9EqXtgQWQ4gZEjAEjPZqzIL5AOr3tHI/to7QfM+PQzAyO84JU9vNBXpfc/g+0PytlmNrdw3q98yZ1NbbCmpW9/56nIYlOd0CRLpRzZ4aREGOQTLSxmYUE6WdjjLnrhnDz0c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658995172276388.2142599549485; Thu, 28 Jul 2022 00:59:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.376668.609606 (Exim 4.92) (envelope-from ) id 1oGyQF-00062S-Vl; Thu, 28 Jul 2022 07:59:07 +0000 Received: by outflank-mailman (output) from mailman id 376668.609606; Thu, 28 Jul 2022 07:59:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGyQF-00062L-SQ; Thu, 28 Jul 2022 07:59:07 +0000 Received: by outflank-mailman (input) for mailman id 376668; Thu, 28 Jul 2022 07:59:06 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGyQE-0005U6-Nf for xen-devel@lists.xenproject.org; Thu, 28 Jul 2022 07:59:06 +0000 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [2a00:1450:4864:20::62f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 26e899c4-0e4b-11ed-bd2d-47488cf2e6aa; Thu, 28 Jul 2022 09:59:05 +0200 (CEST) Received: by mail-ej1-x62f.google.com with SMTP id ez10so1736800ejc.13 for ; Thu, 28 Jul 2022 00:59:05 -0700 (PDT) Received: from uni.router.wind (adsl-69.109.242.233.tellas.gr. [109.242.233.69]) by smtp.googlemail.com with ESMTPSA id l2-20020a1709060cc200b00722e4bab163sm105413ejh.200.2022.07.28.00.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jul 2022 00:59:04 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 26e899c4-0e4b-11ed-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/yzGIK2WwUM9PEPFz0+ZahCjAacTI+5nDzYSTopw8Ts=; b=M0cNJH2zhlkpeo8XXDiOm7SfO4krIBzji+YhF7TmZS8anUKzk/y+WcdQ2/XtAKoz/D hlNENv+pge/lfDBSlCUQipjoNUVi7tm1V+iTYlk2hYcI/DDheCQoGd2XTmZ61xOPh79E DMGSgqGdK8mm/FRw1YKduSypcaZxwu6n2hLmtKLDbX/5kzncHRFPfytHUDomce3zuM/v ZuP7d8IQOBaULncfTHIBm1rq2pLVy2JNsOuegjGNkhE015Kwx/agSJJyc2164mC3eorq OjJHokKmC4gIpo8+dxyECAeC8TFjUvi8H+AyoDuouh7Ap7xfYCSG32I82/HoaPv745PQ yweQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/yzGIK2WwUM9PEPFz0+ZahCjAacTI+5nDzYSTopw8Ts=; b=ROG9/03MpyNQdjKsdOVR4kgyC6sWcEBSS1GUXRRejoQOpeU9GgM8cLfx4DwX8ZFKz+ 94JH7N/mnUymzmf0RCMmRq6Ku6ycDqE8/VMZs4lDRBrBgqI4PL50BDbDV1qjdHdEJ1gf 7Zzy5OlHb88Mi8j69syBDZ/C/1HJ1I4Z/BeSV9mDhjYxEbr5/PYOA5l2TJDq5BHROkjH V8yyjqiuUMq6znl84ASB6cn1UPB9l6llbFwdQTlvTWATOfQv9NT7XiX9M5nM/zaNzhEH vaxZdkCzXmLhv8Wj9kuSk6if4TC3HsL2K4m2Mr0ArFkdHWL285eNn5mPr96emg9fhja4 2eRw== X-Gm-Message-State: AJIora82PRmyjbwpthmCBX1/ciG+VVhOdfXzBap+LNb1hwZSoTntp3mG h1o7cQHjL73LJlKYfnnJGoCiw3x9cYc= X-Google-Smtp-Source: AGRyM1uuYqJjK5utoLyYZGuSAR9RoXypk1dlKzOB00lmoVcAPKW2HClruhluLhrBviRmZHDzL7Wahw== X-Received: by 2002:a17:907:738a:b0:72e:8510:6bfd with SMTP id er10-20020a170907738a00b0072e85106bfdmr19411003ejc.688.1658995145128; Thu, 28 Jul 2022 00:59:05 -0700 (PDT) From: Xenia Ragiadakou To: xen-devel@lists.xenproject.org Cc: Doug Goldstein , Stefano Stabellini , Penny Zheng Subject: [PATCH v3 2/2] automation: arm64: Create a test job for testing static allocation on qemu Date: Thu, 28 Jul 2022 10:58:56 +0300 Message-Id: <20220728075856.1175504-3-burzalodowa@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220728075856.1175504-1-burzalodowa@gmail.com> References: <20220728075856.1175504-1-burzalodowa@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1658995173522100003 Content-Type: text/plain; charset="utf-8" Enable CONFIG_STATIC_MEMORY in the existing arm64 build. Create a new test job, called qemu-smoke-arm64-gcc-staticmem. Adjust qemu-smoke-arm64.sh script to accomodate the static memory test as a new test variant. The test variant is determined based on the first argument passed to the script. For testing static memory, the argument is 'static-me= m'. The test configures DOM1 with a static memory region and adds a check in the init script. The check consists in comparing the contents of the /proc/device-tree memory entry with the static memory range with which DOM1 was configured. If the memory layout is correct, a message gets printed by DOM1. At the end of the qemu run, the script searches for the specific message in the logs and fails if not found. Signed-off-by: Xenia Ragiadakou Reviewed-by: Penny Zheng Reviewed-by: Stefano Stabellini --- Changes in v2: - enable CONFIG_STATIC_MEMORY for all arm64 builds - use the existing qemu-smoke-arm64.sh with an argument passed for distinguishing between tests, instead of creating a new script - test does not rely on kernel logs but prints a message itself on success - remove the part that enables custom configs for arm64 builds - add comments - adapt commit message Changes in v3: - refactor the changes to improve readability, no functionality change inte= nded - add Penny's R-b tag automation/gitlab-ci/test.yaml | 18 ++++++++++++++++++ automation/scripts/build | 10 +++++++++- automation/scripts/qemu-smoke-arm64.sh | 25 ++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 26bdbcc3ea..6f9f64a8da 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -80,6 +80,24 @@ qemu-smoke-arm64-gcc: tags: - arm64 =20 +qemu-smoke-arm64-gcc-staticmem: + extends: .test-jobs-common + variables: + CONTAINER: debian:unstable-arm64v8 + script: + - ./automation/scripts/qemu-smoke-arm64.sh static-mem 2>&1 | tee qemu-= smoke-arm64.log + needs: + - debian-unstable-gcc-arm64 + - kernel-5.9.9-arm64-export + - qemu-system-aarch64-6.0.0-arm64-export + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - arm64 + qemu-smoke-arm32-gcc: extends: .test-jobs-common variables: diff --git a/automation/scripts/build b/automation/scripts/build index 21b3bc57c8..2b9f2d2b54 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -15,7 +15,15 @@ if [[ "${RANDCONFIG}" =3D=3D "y" ]]; then make -j$(nproc) -C xen KCONFIG_ALLCONFIG=3Dtools/kconfig/allrandom.con= fig randconfig hypervisor_only=3D"y" else - make -j$(nproc) -C xen defconfig + if [[ "${XEN_TARGET_ARCH}" =3D "arm64" ]]; then + echo " +CONFIG_EXPERT=3Dy +CONFIG_UNSUPPORTED=3Dy +CONFIG_STATIC_MEMORY=3Dy" > xen/.config + make -j$(nproc) -C xen olddefconfig + else + make -j$(nproc) -C xen defconfig + fi fi =20 # Save the config file before building because build failure causes the sc= ript diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qe= mu-smoke-arm64.sh index 53086a5ac7..69d9eae7a9 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -2,6 +2,23 @@ =20 set -ex =20 +test_variant=3D$1 + +passed=3D"BusyBox" +check=3D"" + +if [[ "${test_variant}" =3D=3D "static-mem" ]]; then + # Memory range that is statically allocated to DOM1 + domu_base=3D"50000000" + domu_size=3D"10000000" + passed=3D"${test_variant} test passed" + check=3D"current=3D\$(hexdump -e '16/1 \"%02x\"' /proc/device-tree/mem= ory@${domu_base}/reg 2>/dev/null) +expected=3D$(printf \"%016x%016x\" 0x${domu_base} 0x${domu_size}) +if [[ \"\${expected}\" =3D=3D \"\${current}\" ]]; then + echo \"${passed}\" +fi" +fi + # Install QEMU export DEBIAN_FRONTENT=3Dnoninteractive apt-get -qy update @@ -43,6 +60,7 @@ echo "#!/bin/sh mount -t proc proc /proc mount -t sysfs sysfs /sys mount -t devtmpfs devtmpfs /dev +${check} /bin/sh" > initrd/init chmod +x initrd/init cd initrd @@ -68,6 +86,11 @@ DOMU_MEM[0]=3D"256" LOAD_CMD=3D"tftpb" UBOOT_SOURCE=3D"boot.source" UBOOT_SCRIPT=3D"boot.scr"' > binaries/config + +if [[ "${test_variant}" =3D=3D "static-mem" ]]; then + echo -e "\nDOMU_STATIC_MEM[0]=3D\"0x${domu_base} 0x${domu_size}\"" >> = binaries/config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c binarie= s/config @@ -89,5 +112,5 @@ timeout -k 1 240 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial =20 set -e -(grep -q "^BusyBox" smoke.serial && grep -q "DOM1: BusyBox" smoke.serial) = || exit 1 +(grep -q "^BusyBox" smoke.serial && grep -q "DOM1: ${passed}" smoke.serial= ) || exit 1 exit 0 --=20 2.34.1