From nobody Fri Apr 26 00:10:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1578557830; cv=none; d=zohomail.com; s=zohoarc; b=GeNt72XwnemEUZHdMKsS3lxBSxDvEiE9WCqqOR0tANP1jNPPUDSje0AWp8UjVSflwBj5/4HpZxP4cbDGRkFItNANu7dhRW6l+9aFDlxG32BucW3aC8gBxC2/UOotzJuBh5oe6/OrHqgs4C+YSZenSHKyYu744O95sz8ujKnyy2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578557830; h=Content-Type:Content-Transfer-Encoding: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=v3lVIgrfVBx5/oQue9mXiqaDWgUMboK3AtSLoGEtSd8=; b=jgYSFZdGFlADZ3B7h3QexlWy7VuVFzbvqNb3X1dUatpVu2ypspPr5WkArcuMGv77I45ZinaA0+aLlSuatpaEsq2rOK88cT05lp0hS70t2D2pqoZL10z0iyDs0sVRo/FCc+U/r3WTmdb0GOvHVO2fDAGcHHLQz2H6S7cbl5e6Pdo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578557830525967.9007851572238; Thu, 9 Jan 2020 00:17:10 -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-36-L3ajIcmjMkaiygZL38-K5Q-1; Thu, 09 Jan 2020 03:17:05 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C901DB25; Thu, 9 Jan 2020 08:16:57 +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 51F7360CC0; Thu, 9 Jan 2020 08:16:57 +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 105E6503C0; Thu, 9 Jan 2020 08:16:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0098GrTc014431 for ; Thu, 9 Jan 2020 03:16:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 03DAC1000328; Thu, 9 Jan 2020 08:16:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A9651001925 for ; Thu, 9 Jan 2020 08:16:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578557829; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=v3lVIgrfVBx5/oQue9mXiqaDWgUMboK3AtSLoGEtSd8=; b=bmsxhxfbRs/WTueOWabQhUzx3RG3RtLL6ELnfL2k5TRp9XtMqzdk0j+AagSRZWiHopmCAC HP08/e+aMXBPSPiJNjI0//2Ch90Pzeg0IADXkschT0zv10TkPRKYK8LMbt1yYKXKxs2Tb5 CyQjt9kmApDpr3K4fhluQHe3OT88RL8= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 09:16:33 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/16] bootstrap.conf: drop gnulib tests from libvirt 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.12 X-MC-Unique: L3ajIcmjMkaiygZL38-K5Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We are in process of removing gnulib and adopting meson as our build system. In order to help with the transition let's drop gnulib tests. This will also help with the fact that before we will be able to drop gnulib completely we will store output of bootstrap in git. Signed-off-by: Pavel Hrdina --- .gitignore | 2 -- Makefile.am | 2 +- bootstrap.conf | 13 ------------- configure.ac | 1 - gnulib/tests/Makefile.am | 32 -------------------------------- 5 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 gnulib/tests/Makefile.am diff --git a/.gitignore b/.gitignore index 2d6e3e3194..2139d176da 100644 --- a/.gitignore +++ b/.gitignore @@ -27,12 +27,10 @@ Makefile.in =20 # gnulib related ignores !/gnulib/lib/Makefile.am -!/gnulib/tests/Makefile.am *.rej *~ /gnulib/lib/* /gnulib/m4/* -/gnulib/tests/* =20 # git related ignores *.orig diff --git a/Makefile.am b/Makefile.am index 0d7ccc74db..8a8eecb697 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ GENHTML =3D genhtml # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 -SUBDIRS =3D . gnulib/lib include/libvirt src tools docs gnulib/tests \ +SUBDIRS =3D . gnulib/lib include/libvirt src tools docs \ tests po examples =20 XZ_OPT ?=3D -v -T0 diff --git a/bootstrap.conf b/bootstrap.conf index ae9ecb4039..13d0e77514 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -143,13 +143,10 @@ fi gnulib_name=3Dlibgnu m4_base=3Dm4 source_base=3Dgnulib/lib -tests_base=3Dgnulib/tests gnulib_tool_option_extras=3D"\ --lgpl=3D2\ - --with-tests\ --makefile-name=3Dgnulib.mk\ --avoid=3Dpt_chown\ - --avoid=3Dlock-tests\ " local_gl_dir=3Dgnulib/local =20 @@ -184,16 +181,6 @@ gnulib_extra_files=3D" doc/INSTALL " =20 - -bootstrap_post_import_hook() -{ - # Change paths in gnulib/tests/gnulib.mk from "../../.." to "../..", - # and make tests conditional by changing "TESTS" to "GNULIB_TESTS". - m=3Dgnulib/tests/gnulib.mk - sed 's,\.\./\.\./\.\.,../..,g; s/^TESTS /GNULIB_TESTS /' $m > $m-t - mv -f $m-t $m -} - bootstrap_epilogue() { echo "$0: done. Now you can run 'mkdir build && cd build && ../config= ure'." diff --git a/configure.ac b/configure.ac index cbfb3fe1aa..2be909b7ce 100644 --- a/configure.ac +++ b/configure.ac @@ -922,7 +922,6 @@ AC_CONFIG_FILES([run], AC_CONFIG_FILES([\ Makefile src/Makefile include/libvirt/Makefile docs/Makefile \ gnulib/lib/Makefile \ - gnulib/tests/Makefile \ .color_coded \ .ycm_extra_conf.py \ libvirt.pc \ diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am deleted file mode 100644 index 7062cbaf87..0000000000 --- a/gnulib/tests/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## Makefile for gnulib/lib - -## Copyright (C) 2011, 2013 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -include gnulib.mk - -GNULIB_TESTS0 =3D -GNULIB_TESTS1 =3D $(GNULIB_TESTS) -if WITH_EXPENSIVE_TESTS -## Automake requires that at least one conditional call out all tests to -## be run, for those tests to be shipped in the tarball -TESTS =3D $(GNULIB_TESTS) -endif WITH_EXPENSIVE_TESTS -## However, we want to change the set of tests based on the make environme= nt, -## where the default was set at configure time. Use GNU make constructs to -## hide our actions from Automake, so we don't get it too confused. -VIR_TEST_EXPENSIVE ?=3D $(VIR_TEST_EXPENSIVE_DEFAULT) -$(eval TESTS=3D$(GNULIB_TESTS$(VIR_TEST_EXPENSIVE))) --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list