From nobody Tue Jul 22 10:40:43 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 4bmYhC6SCKz62rv7; Tue, 22 Jul 2025 10:40:43 +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 4bmYhC33Ldz3hLH; Tue, 22 Jul 2025 10:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753180843; 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=8oZ+7HTM6+fEH2JRku4pRWrCc3Rw13jGgo7RmElRcH4=; b=IE5Eoytf9T1x6DE38CUhxSFEz4zE9la0YepVD9cBP8weg+dwHIFBJ2XYFimfl7FBmKHDpI gHHtLU8L9duGAQhOe+vCV3RdwdHnhG03mVcE7PUr+iD7yfic6FJhqGr6NrXTvLSkgkp/kR w93t79/LoobK83lCVOimVvBM/chzxJ2DwlRzYlyzZ9LbrF7Kj9oNOj5jdV1LiC50RLHfCI nYnCBUiVhlNlBghjNh3AQUF35kIduy2RFlkA/ZYvwsh0mYYui674ETN6GqPHasX6eZ7QbX CHpCLPzQrFToEAXAwosidhlcEB+zOXRLiBrCKq9TP9yIIdnMKrtfZ+QKsnVEiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753180843; 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=8oZ+7HTM6+fEH2JRku4pRWrCc3Rw13jGgo7RmElRcH4=; b=j5CM8PFaZWZ1tFIKqiYIBqvfRs+C+gSpjGV8xDg6x9Ua8ViLMwSRaHQRryGKLvI6ipjbq9 Xa3V4UuNfmJgzhv8CWid/8pjYHG5b4h2a9586LzUrBf+5BvpFx6nftVijeJWCIkIEFvNhL 61iKyu7YdGYfG8Sb6DCb4aaIFeMff7eJZfScUrEoLcQpyI/ULsaZeLr2Bb55jQ8TrtBbAy 7r5ba3ic3bsS9EqtCnKIN7GjkoOwEwX9pnP/Y73k1WX2TsyeF6mzIE24WOyn3fYLSfzPe+ CKQt7HTY+n/ld19ey9IyE1lMn4v31bLsZkBK0AFd4WQ6vJX+9oT3awCL20W4Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753180843; a=rsa-sha256; cv=none; b=M1QoxuKGWOWtQALrvfo1FcLt5geNzhns06YMtK5wqz0yHcECOjm9GPYD8DClKbr2eot3PI j325VBjja1MjEmAJ8B5w9pzevqekZ3vT1PFeHY8cwpgsEh9oDXdlE2icdsb6lcNyqZPnHd NoWu1ci5koI6qqva6eN2oXDZiN2hscBWsP5l/FnkRzYzorYoG9kjGewnzXTVWhkzZEdjJK 7CyUuxfImgFDdTfY7YAFztDksxrWFcfv0letU/Yai2upfw3f/JensXnkRLwsSHuYi76TSA ibAiXaqxJE7lihPgRQM/INfMLWEJuZMCNdwqrqN+uVIh0J93+HPrZxPonfIu3Q== 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 4bmYhC2F7lz800; Tue, 22 Jul 2025 10:40:43 +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 56MAeh6Z086389; Tue, 22 Jul 2025 10:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56MAehoG086386; Tue, 22 Jul 2025 10:40:43 GMT (envelope-from git) Date: Tue, 22 Jul 2025 10:40:43 GMT Message-Id: <202507221040.56MAehoG086386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 7f849b7f4e19 - main - tests/ci: Indent Makefile properly 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: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f849b7f4e192d32d617c492d50197c09bd20a56 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=7f849b7f4e192d32d617c492d50197c09bd20a56 commit 7f849b7f4e192d32d617c492d50197c09bd20a56 Author: Muhammad Moinur Rahman AuthorDate: 2025-07-22 10:39:51 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-07-22 10:40:33 +0000 tests/ci: Indent Makefile properly Approved by: imp, lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51445 --- tests/ci/Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/ci/Makefile b/tests/ci/Makefile index 06c6554564a9..b8797e06ac75 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -33,11 +33,11 @@ EXTRA_MAKE_FLAGS?= TARGET= ${MACHINE} .endif .if !defined(TARGET_ARCH) || empty(TARGET_ARCH) -.if ${TARGET} == ${MACHINE} +. if ${TARGET} == ${MACHINE} TARGET_ARCH= ${MACHINE_ARCH} -.else +. else TARGET_ARCH= ${TARGET} -.endif +. endif .endif IMAKE= ${MAKE} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} @@ -47,20 +47,20 @@ CROSS_TOOLCHAIN_PARAM= "CROSS_TOOLCHAIN=${CROSS_TOOLCHAIN}" # Define OSRELEASE by using newvers.sh .if !defined(OSRELEASE) || empty(OSRELEASE) -.for _V in TYPE BRANCH REVISION -. if !defined(${_V}) || empty(${_V}) +. for _V in TYPE BRANCH REVISION +. if !defined(${_V}) || empty(${_V}) ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../../sys/conf/newvers.sh); echo $$${_V} -. endif -.endfor -.for _V in ${TARGET_ARCH} -.if !empty(TARGET:M${_V}) +. endif +. endfor +. for _V in ${TARGET_ARCH} +. if !empty(TARGET:M${_V}) OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET} VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET} -.else +. else OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH} VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH} -.endif -.endfor +. endif +. endfor .endif .if exists(${.CURDIR}/tools/ci.conf) && !defined(CICONF) @@ -104,10 +104,10 @@ TIMEOUT_VM=$$((${TIMEOUT_EXPECT} - 120)) . include "${.CURDIR}/Makefile.${TARGET_ARCH}" .endif .if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) +. if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) QEMUSTATIC=/usr/local/bin/qemu-${QEMU_ARCH}-static QEMUTGT=portinstall-qemu -.endif +. endif .endif QEMUTGT?= QEMU_DEVICES?=-device virtio-blk,drive=hd0 -device virtio-blk,drive=hd1