Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Jul 2025 20:26:10 GMT
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ed4c64bc792f - main - tests/ci: Use suitable variable for qemu-user-static existence check
Message-ID:  <202507072026.567KQAFa024743@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/src/commit/?id=ed4c64bc792fd2509d8fd6805f8e174c2db62338

commit ed4c64bc792fd2509d8fd6805f8e174c2db62338
Author:     Siva Mahadevan <me@svmhdvn.name>
AuthorDate: 2025-07-02 19:00:06 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
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 <me@svmhdvn.name>
    
    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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507072026.567KQAFa024743>