From nobody Mon Jul 7 20:26:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bbbNf4grKz617tM; Mon, 07 Jul 2025 20:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbbNf3LYvz3S1k; Mon, 07 Jul 2025 20:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751919970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3aOzc+UCeZoNwzvqEagWsii6WTefBkWVjS1y9q4m3I8=; b=Td2pB5hmwEMy0Aj/xeRkyKiPCZPKaRbrVScTkaAZZPkBifYeQ/yRRIUWGSKuf/UeIuA3wW d7cEG1kczfv0r1S2P/rxQAJzyEceB8k8t9m1m2YNabusOyeHAa/9eGrHRf0qJoGigNmzgw zoZvI7H5hH3hgyTohejhwV5NFuSLXpy2cu2vw50NcL6C2u8glFxb4J4v477p5Pofubuy/X A3GJYmfet2eboJG1wJT//dXjzDO2AZMqUp8Ax4WuV/Gg2G3/rWVJQfnjKTD3XopRJr1NXK WztT+v+7rVFVFWwdLx9XGkJMyOyY1UPLTDfxC/c8Mf1fFNpUS3ZcuGqsz/oMXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751919970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3aOzc+UCeZoNwzvqEagWsii6WTefBkWVjS1y9q4m3I8=; b=pUv/H3Hx9Nnx2F6gkCgVcMWYL4nRacaEMcIx64Zll70/0xq+KhO1IykX0FbbVwnO+yf7qA KRYftt4qkhDMcNhUr2tu2hi9s6OHkCxW3QQ3m7oKo8ZgeXeUyOHZF9PAMpfFbIFTePapp8 6lWY33nYmzJnNMye4aOQGo3jtbedB0RGORJrPIhjtxH5Cy7g5fhco0do7Eo71klO/+2R47 K0P6IiKBT7bpPrl1Zkx36N5GGnyYCRE7vnwBxjoIlV76+3cmo97w3fkxb2saIKOG8QKXHt fExG7/VSj7ZuqUPikLdZcDBGp+oKS9MzNSagfs0fVg7ihFRFWqoKOv8jkmE05g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751919970; a=rsa-sha256; cv=none; b=tn3Itpfj9g09OG7TJXXwkdTxio2g9KsWpCWFtQgzCLYUQSfvOQRm12sECJ6OM7GvKCJ/Ur KoGOQ2gHkna1iHgLD1uBs3UDiN3Foj7RffXgyi4DwsFSZcs8HaJn9ChhpglhwirJT3pX07 ccEV/zhzxvjxuOkujL3M129yJH7/Fe0WQhTOqN0OplD3Yb0raEgv1uwn0HbVzYKPtV0W5h eA3uytzphB1Wg1XXcg/2Z4NM7OXJQk6gaNsbAuagmUt32e/KILYg9L9GCX6OBIT8eyKshJ sXVyCud0uYcIFpxOFMyMeQi6omZhbQifwYxTVGWMKCx+HbwN6k0UQN0sMGpOiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbbNf2k0Hz14dQ; Mon, 07 Jul 2025 20:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 567KQAwl024746; Mon, 7 Jul 2025 20:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567KQAFa024743; Mon, 7 Jul 2025 20:26:10 GMT (envelope-from git) Date: Mon, 7 Jul 2025 20:26:10 GMT Message-Id: <202507072026.567KQAFa024743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: ed4c64bc792f - main - tests/ci: Use suitable variable for qemu-user-static existence check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed4c64bc792fd2509d8fd6805f8e174c2db62338 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=ed4c64bc792fd2509d8fd6805f8e174c2db62338 commit ed4c64bc792fd2509d8fd6805f8e174c2db62338 Author: Siva Mahadevan AuthorDate: 2025-07-02 19:00:06 +0000 Commit: Li-Wen Hsu CommitDate: 2025-07-07 20:25:20 +0000 tests/ci: Use suitable variable for qemu-user-static existence check And simplify a qemu-system existence check. Signed-off-by: Siva Mahadevan Reviewed by: imp Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1751 --- tests/ci/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ci/Makefile b/tests/ci/Makefile index b57de345f852..271fc377619b 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -144,10 +144,10 @@ portinstall-pkg: .PHONY .endif portinstall-qemu: portinstall-pkg .PHONY -.if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) +.if !exists(/usr/local/bin/qemu-${QEMU_ARCH}-static) env ASSUME_ALWAYS_YES=yes pkg install emulators/qemu-user-static .endif -.if !exists(/usr/local/bin/qemu-system-${QEMU_ARCH}) +.if !exists(${QEMUBIN}) env ASSUME_ALWAYS_YES=yes pkg install emulators/qemu@nox11 .endif