From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id B93205A0320 for ; Mon, 05 Aug 2024 14:37:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1722861425; bh=rYTFkL/iSDiRLNYJxwU5xtw9ddZzkYkYIp9di99521A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TLtVTWouiAQzl1KT1aBIbAdztj0uSbgFdMPgh18qS0+4qsT7Kaa2iwhFU9oDTZC47 99cx+TFZJyPn8v49Y6NDhtMOP/og1XT5morwlBtd2/K3MFooagyN6QAAcGe7fbfReg HefOb+aKTNhM7cSf3UCSe/vV9S2wI/+ZlGvR/7NLref1ZlDZseTbcgmcOht6Sp1fIw 7FOZOijiQzHU2tiKIBUQdb7jngHJ73BkRMMl/l0uVPUEmdd/rjGrIRiU07vCx45TNj SjVwIQ3QSKjkk3nf+7Jh719zUZOquFdA+sMlMty9Ep6WEkmQvWVsmbMf7YOSWtZa9q 55r61eajv0Tfg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4WcwtT1q5dz4x4c; Mon, 5 Aug 2024 22:37:05 +1000 (AEST) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 04/22] test: Extend make targets to run Avocado tests Date: Mon, 5 Aug 2024 22:36:43 +1000 Message-ID: <20240805123701.1720730-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805123701.1720730-1-david@gibson.dropbear.id.au> References: <20240805123701.1720730-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: CTUF5J5DR2EXTN2R4KFDTRO3YOZZVMW7 X-Message-ID-Hash: CTUF5J5DR2EXTN2R4KFDTRO3YOZZVMW7 X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Cleber Rosa , David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Add a new 'avocado' target to the test/ Makefile, which will install avocado into a Python venv, and run the Avocado based tests with it. Signed-off-by: David Gibson --- test/.gitignore | 1 + test/Makefile | 16 ++++++++++++++++ test/run_avocado | 9 +++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/test/.gitignore b/test/.gitignore index 6dd4790b..a79d5b6f 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -10,3 +10,4 @@ QEMU_EFI.fd nstool guest-key guest-key.pub +/venv/ diff --git a/test/Makefile b/test/Makefile index 35a3b559..fda62984 100644 --- a/test/Makefile +++ b/test/Makefile @@ -63,6 +63,12 @@ LOCAL_ASSETS = mbuto.img mbuto.mem.img podman/bin/podman QEMU_EFI.fd \ ASSETS = $(DOWNLOAD_ASSETS) $(LOCAL_ASSETS) +SYSTEM_PYTHON = python3 +VENV = venv +PYTHON = $(VENV)/bin/python3 +PIP = $(VENV)/bin/pip3 +RUN_AVOCADO = cd .. && test/$(PYTHON) test/run_avocado + CFLAGS = -Wall -Werror -Wextra -pedantic -std=c99 assets: $(ASSETS) @@ -116,6 +122,15 @@ medium.bin: big.bin: dd if=/dev/urandom bs=1M count=10 of=$@ +.PHONY: venv +venv: + $(SYSTEM_PYTHON) -m venv $(VENV) + $(PIP) install avocado-framework + +.PHONY: avocado +avocado: venv + $(RUN_AVOCADO) avocado + check: assets ./run @@ -127,6 +142,7 @@ clean: rm -f $(LOCAL_ASSETS) rm -rf test_logs rm -f prepared-*.qcow2 prepared-*.img + rm -rf $(VENV) realclean: clean rm -rf $(DOWNLOAD_ASSETS) diff --git a/test/run_avocado b/test/run_avocado index 37db17c3..19a94a8f 100755 --- a/test/run_avocado +++ b/test/run_avocado @@ -32,12 +32,13 @@ from avocado.core.suite import TestSuite def main(): repo_root_path = os.path.abspath( - os.path.dirname(os.path.dirname(os.path.dirname(__file__))) + os.path.dirname(os.path.dirname(__file__)) ) + + references = [os.path.join(repo_root_path, 'test', x) for x in sys.argv[1:]] + config = { - "resolver.references": [ - os.path.join(repo_root_path, "test", "avocado", "static_checkers.json") - ], + "resolver.references": references, "runner.identifier_format": "{args[0]}", } suite = TestSuite.from_config(config, name="static_checkers") -- 2.45.2