From nobody Tue May 7 02:11:01 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=1604920872; cv=none; d=zohomail.com; s=zohoarc; b=NAA8bJBq1gSENo3zsTPhdfcOjdGnASEACD5YW6/CEFSBCqxVzgIOlOKd4ZkllsEAosftdx+12tp98ETmFgqtmHXcFJOcFxvvDJiB3fHxREh6kbY0mh2mEPTb8mNgmYMtibfUnc8pmQI9okQocOF/yXqEn0fsaOrFcgsQQpW1NoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604920872; 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=UZYbqs9YAXYzevfGSOXrIrdBd8BgazWncNag3Um9jHs=; b=fepVrsO1JqOTukg0qjar0/CaoMv2sYgVHAHCX03h+5iKFQ2fy2hYv57QeD5oJyMqbD/Fnlob8gToMfSbc8BeNLWx8n41Sbi3aXMEFtJCKUVq4u4fVC04YONUhIr+9BNwUSxI0xi9nkQJn4aGBuY4jnueyqQhNlNw6O5Uoxst1rQ= 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 160492087263775.34434758983468; Mon, 9 Nov 2020 03:21:12 -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-89-Gk1_bHYiMZCkIdP0WOUjfA-1; Mon, 09 Nov 2020 06:21:09 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 507791868424; Mon, 9 Nov 2020 11:21:03 +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 3068A5B4D5; Mon, 9 Nov 2020 11:21:03 +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 EE733181A06B; Mon, 9 Nov 2020 11:21:02 +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 0A9BL2GU009938 for ; Mon, 9 Nov 2020 06:21:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 55D9F1F5; Mon, 9 Nov 2020 11:21:02 +0000 (UTC) Received: from nautilus.redhat.com (unknown [10.40.192.244]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FBB46115F; Mon, 9 Nov 2020 11:21:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604920871; 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=UZYbqs9YAXYzevfGSOXrIrdBd8BgazWncNag3Um9jHs=; b=OklNaqPruWSe2hmemKYEYjDeDj4FptK0URMWPh9j53o08cbfKJ5hTfROdSujXQbE7dJTa6 BBlITHbboWPwKMEMJG1rgPxQDevryhy6fybmQrLw4/i5d9fB6ne9wdjj1G9upMLkC3PC01 APAmrylwy2cbKhlyX52Roqe8o5r0Fh0= X-MC-Unique: Gk1_bHYiMZCkIdP0WOUjfA-1 From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/2] ci: Switch to meson build system Date: Mon, 9 Nov 2020 12:20:52 +0100 Message-Id: <05673dd7d3e956a93fc69d9aed867cd66a633c6e.1604920785.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.11 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 | 10 ++++++++-- ci/build.sh | 20 +++++--------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index c7c8eb9a45..f76600240f 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -35,6 +35,9 @@ 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 ninja +CI_NINJA_ARGS =3D + # Any extra arguments to pass to make CI_MAKE_ARGS =3D =20 @@ -227,6 +230,8 @@ ci-run-command@%: ci-prepare-tree CI_CONFIGURE=3D"$(CI_CONFIGURE)" \ CI_CONFIGURE_ARGS=3D"$(CI_CONFIGURE_ARGS)" \ CI_MAKE_ARGS=3D"$(CI_MAKE_ARGS)" \ + MESON_OPTS=3D"$$MESON_OPTS" \ + CI_NINJA_ARGS=3D"$(CI_NINJA_ARGS)" \ $(CI_COMMAND) || exit 1' @test "$(CI_CLEAN)" =3D "1" && rm -rf $(CI_SCRATCHDIR) || : =20 @@ -236,8 +241,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 @@ -268,4 +273,5 @@ ci-help: @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..21b053a4cd 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -7,26 +7,16 @@ # # 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 $MESON_OPTS || (cat build/meson-logs/meson-log.txt &&= exit 1) +ninja -C build $CI_NINJA_ARGS + 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 Tue May 7 02:11:01 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=1604920876; cv=none; d=zohomail.com; s=zohoarc; b=INWmaZjlp+Ot7t5LODC/1qADqz8qjMC6rweuQxBVDXu5ouny0Pdpb0rPbBsXPCtWD7zOv8M6YLzCHLSfgyXPgE+IqBfvXrIvYOvEG7nwsWrfeGeuHjSLZCo4rxkV8qVh9I7dCg9klVa/Y/wCMYY2dsA+mHOxuBC1dh9c2mgaVj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604920876; 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=gy2ITyM8+ey+I4YwVl/vIFtwiJxIrxecmz/Wu0UUxqs=; b=PJkQMm9qTtTxjajwrziO2DN/hUT10uhQGdjJwxwfzG94dQwpUWKXOEUHnSt1OuyZ187aM6Lfkif5r7iGFbAAxOb4fkQg1wBgRLmKM7qaFdK2m/E/rlHPzlKlJ7yDOp121mwlnXcUauTsgKwG7ULjzzWn2H3r1rwWCwvpd9u3trE= 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 1604920876807391.40353938434555; Mon, 9 Nov 2020 03:21:16 -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-307-rUw5AVWgPUmExVLLJkbobw-1; Mon, 09 Nov 2020 06:21:13 -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 407A01084C8E; Mon, 9 Nov 2020 11:21:07 +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 211F55D990; Mon, 9 Nov 2020 11:21:07 +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 E2B4F181A06E; Mon, 9 Nov 2020 11:21:06 +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 0A9BL50l009955 for ; Mon, 9 Nov 2020 06:21:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id B6FFC1F5; Mon, 9 Nov 2020 11:21:05 +0000 (UTC) Received: from nautilus.redhat.com (unknown [10.40.192.244]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D397672C6; Mon, 9 Nov 2020 11:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604920875; 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=gy2ITyM8+ey+I4YwVl/vIFtwiJxIrxecmz/Wu0UUxqs=; b=DM0gGcxZ/behVcjjD7FM+2shHf5BF7I2GSz/VyeIWl2iqJ5xRY9kjJYDDPc3zvFnnk15ZT ree0OwRKTFs7qy4ldCYdFcdxSdI90yj6MrYVdaKwrvsl3DvzXBQv39ttckcrvsd+4ksImc sMWF8ExDKCxNY5Q7o5D6CkPFJ5VCaSU= X-MC-Unique: rUw5AVWgPUmExVLLJkbobw-1 From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/2] ci: Drop env variables related to autotools and make Date: Mon, 9 Nov 2020 12:20:53 +0100 Message-Id: <2da78301a2ed78ecd3f80fb491b04813cbf0e70f.1604920785.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, runs by default in parallel on all available CPUs, and we don't use configure anymore - the corresponding variables are thus longer needed. Signed-off-by: Erik Skultety --- ci/Makefile | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index f76600240f..e8832a024e 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -20,30 +20,9 @@ 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 - -# Default to using all possible CPUs -CI_SMP =3D $(shell getconf _NPROCESSORS_ONLN) - # Any extra arguments to pass to ninja CI_NINJA_ARGS =3D =20 -# Any extra arguments to pass to make -CI_MAKE_ARGS =3D - -# Any extra arguments to pass to configure -CI_CONFIGURE_ARGS =3D - # Script containing environment preparation steps CI_PREPARE_SCRIPT =3D $(CI_ROOTDIR)/prepare.sh =20 @@ -223,13 +202,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_CONFIGURE=3D"$(CI_CONFIGURE)" \ - CI_CONFIGURE_ARGS=3D"$(CI_CONFIGURE_ARGS)" \ - CI_MAKE_ARGS=3D"$(CI_MAKE_ARGS)" \ MESON_OPTS=3D"$$MESON_OPTS" \ CI_NINJA_ARGS=3D"$(CI_NINJA_ARGS)" \ $(CI_COMMAND) || exit 1' @@ -271,7 +244,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 --=20 2.26.2