From nobody Sat May 4 05:39:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604918025; cv=none; d=zohomail.com; s=zohoarc; b=JTxhW0phT4XQ/11/bITR7KKIVstKrkpBXUuwuU/6KlzQNFbmmPEKQtgw5gyTuSy5+7of9Ru7PfdJHYNuHNFR0gCqsYt2oy4dKsY8KnZ5zk4hYtTaYuA8BuErbQ64rluHBxVqCyEto6SAm3FFWDmV6jVV40Myxk7KFO8I3p8UAlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604918025; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0TBJKBMAIoA7OxkDcwab+T9Yu3yAjiDRUc6xtVySKBI=; b=glRi4Cr4WXOHQE3R8hCQy4SW94F3nj/v14RahuuiLeafT1NCHSTNA+ndWwirBLjUrSycexn1xE/QOnpNrkGfLzHjAfLHs8N+2A0N6Jg4JV3NIohKqSLLkJmLa852mQEkp3B83qajTxqdIDEdFF7c0WUB7Q8PvesSqRXuLRSNkGI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604918025649687.3012968980771; Mon, 9 Nov 2020 02:33:45 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-353-MC33baU8Mvmkqp97dO2hog-1; Mon, 09 Nov 2020 05:33:42 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F7C5802B73; Mon, 9 Nov 2020 10:33:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A0BE1002391; Mon, 9 Nov 2020 10:33:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DC5EC181A06B; Mon, 9 Nov 2020 10:33:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A9AWqKo003691 for ; Mon, 9 Nov 2020 05:32:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3590C6115F; Mon, 9 Nov 2020 10:32:52 +0000 (UTC) Received: from nautilus.redhat.com (unknown [10.40.192.244]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E66A60E1C; Mon, 9 Nov 2020 10:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604918024; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0TBJKBMAIoA7OxkDcwab+T9Yu3yAjiDRUc6xtVySKBI=; b=REnuYLKMGJzzk5hgKdBDEaPEItdB4BwoFAPuu83IossrQH4/n//wrBtEVt3ActbFPfKO8V YdNPnyHpO9OaKEZWKGA6fAkU0zTCYzF5o62c1rHXW2etDDIuXDt7YU3dEKjknpmVkP9+3j 1jgBKMutW7u2Ji0ik2g3obBnaMf173o= X-MC-Unique: MC33baU8Mvmkqp97dO2hog-1 From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] ci: Switch to meson build system Date: Mon, 9 Nov 2020 11:32:45 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: eskultet@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" First add the meson required bits to be able to run the build. NOTE: inspired by our gitlab-ci.yml Signed-off-by: Erik Skultety --- ci/Makefile | 18 ++++++------------ ci/build.sh | 21 ++++++--------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index c7c8eb9a45..d3f14156c5 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -35,11 +35,8 @@ CI_CONFIGURE =3D $(CI_CONT_SRCDIR)/configure # Default to using all possible CPUs CI_SMP =3D $(shell getconf _NPROCESSORS_ONLN) =20 -# Any extra arguments to pass to make -CI_MAKE_ARGS =3D - -# Any extra arguments to pass to configure -CI_CONFIGURE_ARGS =3D +# Any extra arguments to pass to ninja +CI_NINJA_ARGS =3D =20 # Script containing environment preparation steps CI_PREPARE_SCRIPT =3D $(CI_ROOTDIR)/prepare.sh @@ -224,9 +221,7 @@ ci-run-command@%: ci-prepare-tree CI_CONT_SRCDIR=3D"$(CI_CONT_SRCDIR)" \ CI_CONT_BUILDDIR=3D"$(CI_CONT_BUILDDIR)" \ CI_SMP=3D"$(CI_SMP)" \ - CI_CONFIGURE=3D"$(CI_CONFIGURE)" \ - CI_CONFIGURE_ARGS=3D"$(CI_CONFIGURE_ARGS)" \ - CI_MAKE_ARGS=3D"$(CI_MAKE_ARGS)" \ + CI_NINJA_ARGS=3D"$(CI_NINJA_ARGS" \ $(CI_COMMAND) || exit 1' @test "$(CI_CLEAN)" =3D "1" && rm -rf $(CI_SCRATCHDIR) || : =20 @@ -236,8 +231,8 @@ ci-shell@%: ci-build@%: $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build" =20 -ci-check@%: - $(MAKE) -C $(CI_ROOTDIR) ci-build@$* CI_MAKE_ARGS=3D"check" +ci-test@%: + $(MAKE) -C $(CI_ROOTDIR) ci-build@$* CI_NINJA_ARGS=3Dtest =20 ci-list-images: @echo @@ -266,6 +261,5 @@ ci-help: @echo " CI_CLEAN=3D0 - do not delete '$(CI_SCRATCHDIR)' after= completion" @echo " CI_REUSE=3D1 - re-use existing '$(CI_SCRATCHDIR)' con= tent" @echo " CI_ENGINE=3Dauto - container engine to use (podman, docke= r)" - @echo " CI_CONFIGURE_ARGS=3D - extra arguments passed to configure" - @echo " CI_MAKE_ARGS=3D - extra arguments passed to make, e.g. s= pace delimited list of targets" + @echo " CI_NINJA_ARGS=3D - extra arguments passed to ninja" @echo diff --git a/ci/build.sh b/ci/build.sh index 2da84c080a..154b73917d 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -7,26 +7,17 @@ # # to make. =20 -mkdir -p "$CI_CONT_BUILDDIR" || exit 1 -cd "$CI_CONT_BUILDDIR" +mkdir -p "$CI_CONT_SRCDIR" || exit 1 +cd "$CI_CONT_SRCDIR" =20 export VIR_TEST_DEBUG=3D1 -NOCONFIGURE=3D1 "$CI_CONT_SRCDIR/autogen.sh" || exit 1 =20 -# $CONFIGURE_OPTS is a env that can optionally be set in the container, -# populated at build time from the Dockerfile. A typical use case would -# be to pass --host/--target args to trigger cross-compilation -# -# This can be augmented by make local args in $CI_CONFIGURE_ARGS -"$CI_CONFIGURE" $CONFIGURE_OPTS $CI_CONFIGURE_ARGS -if test $? !=3D 0; then - test -f config.log && cat config.log - exit 1 -fi +meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1) +ninja -C build "$CI_NINJA_ARGS" +ninja -C build + find -name test-suite.log -delete =20 -make -j"$CI_SMP" $CI_MAKE_ARGS - if test $? !=3D 0; then \ LOGS=3D$(find -name test-suite.log) if test "$LOGS"; then --=20 2.26.2 From nobody Sat May 4 05:39:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604917989; cv=none; d=zohomail.com; s=zohoarc; b=APzc8+StKcBgcXBEa1H9RbcgtwG/9GK/Ctif8DGL33zFGTUxGfEbuZGg0dPqa5RdBtoCl1qXBRhPVNAlZsaxKRGkSq2HZ/oL943ZuafvJPyLiIdUU9BdBNW20rXh2m7+weNNM+cdhOxjySfxDqeZuLCST2XzW5b2WHckcyA4jFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604917989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vKpUM5SQN4bV+HzhKvDk9E4ZaHWhGFqWhEeoO4ylDLY=; b=M4Crp51pIWuUQ6rGADaTtAErXjh5WgY0GWM04vcpJXReDE3MrfaQmWR0m0Z9UP4Y/0zxrpNN7u5wTsY9bogRWIYRnzX2hd8iivzIgmMT3cwuXVm0siCZNWL35H5Fy1M4XFD++Q8urq/TYKme6lLT8C0Pl5OSD5M4t3X/raWhQUI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604917989316929.8870360920542; Mon, 9 Nov 2020 02:33:09 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-WGZgnJGfM_eqwEwbhIQ2sg-1; Mon, 09 Nov 2020 05:33:05 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E22065F9C3; Mon, 9 Nov 2020 10:32:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C059F5D9DD; Mon, 9 Nov 2020 10:32:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 96579CF59; Mon, 9 Nov 2020 10:32:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A9AWrId003704 for ; Mon, 9 Nov 2020 05:32:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3E0596115F; Mon, 9 Nov 2020 10:32:53 +0000 (UTC) Received: from nautilus.redhat.com (unknown [10.40.192.244]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87E9360E1C; Mon, 9 Nov 2020 10:32:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604917988; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vKpUM5SQN4bV+HzhKvDk9E4ZaHWhGFqWhEeoO4ylDLY=; b=I0ykp2Gw/gqfJaQUJwo6vv8BcgiPIOu6LI8spw42jiqtujIQmeA1haqZg0/w96ONGaGFln eqhbS2q42qYLR2QdVyjdq360slGOu9rLSE/9v6OCxekFnSh8Kf7stz8x2uV2uVBF3j5FkR zjeIIYyw8AbBxzF/CWKaF1PElRq4kvc= X-MC-Unique: WGZgnJGfM_eqwEwbhIQ2sg-1 From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] ci: Drop env variables related to autotools and make Date: Mon, 9 Nov 2020 11:32:46 +0100 Message-Id: <68cddc630c8a1515fae80b7286492ee1cfeab94c.1604917956.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: eskultet@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Previous patch switched the build to meson which supports only out-of-tree builds, so these variables are no longer needed. Signed-off-by: Erik Skultety --- ci/Makefile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index d3f14156c5..14a51dcb45 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -20,15 +20,6 @@ CI_HOST_SRCDIR =3D $(CI_SCRATCHDIR)/src # the $(CI_HOST_SRCDIR) directory from the host CI_CONT_SRCDIR =3D $(CI_USER_HOME)/libvirt =20 -# Relative directory to perform the build in. This -# defaults to using a separate build dir, but can be -# set to empty string for an in-source tree build. -CI_VPATH =3D build - -# The directory holding the build output inside the -# container. -CI_CONT_BUILDDIR =3D $(CI_CONT_SRCDIR)/$(CI_VPATH) - # Can be overridden with mingw{32,64}-configure if desired CI_CONFIGURE =3D $(CI_CONT_SRCDIR)/configure =20 @@ -217,9 +208,7 @@ ci-run-command@%: ci-prepare-tree --login \ --user=3D"#$(CI_UID)" \ --group=3D"#$(CI_GID)" \ - CONFIGURE_OPTS=3D"$$CONFIGURE_OPTS" \ CI_CONT_SRCDIR=3D"$(CI_CONT_SRCDIR)" \ - CI_CONT_BUILDDIR=3D"$(CI_CONT_BUILDDIR)" \ CI_SMP=3D"$(CI_SMP)" \ CI_NINJA_ARGS=3D"$(CI_NINJA_ARGS" \ $(CI_COMMAND) || exit 1' --=20 2.26.2