From nobody Sun Apr 28 23:10:33 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=1600780748; cv=none; d=zohomail.com; s=zohoarc; b=A7QhewkV+XNImFfdH/vU4GlOYhjUIaLK0qzUf6CUTWpnot/YSuDjDc2gp8ZSFv4cd8fatepRrYBD5v/U0P2dKEWVQ3wODgNPiTEuJaFoRWog09JHVA/O+vRL3RdhoCPmFS19//7o2I/MBPwLvYwhOgpOU+Dz+KwnvJ1DGkKcd8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600780748; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=aTCpCgXRhHQBx3fwfaJgFAGt1YcPB4EbBVoAC6dC/eQ=; b=Pm4JmRC8SncVXKeQy2mH5XpuQ/igah5SggC4qYWdpWWWQOhNRvByncAT39vrlPO85RVr5Yqv4ZQtiuRO8KnZEVnjbiWBY9Gyn1AIIwsrjSjdhSmIQ68Fk96V5hIZIeg90orBqSAWUtO0Zb4CY1p+p22RKc4KcshzB1j6KFa0Yzw= 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 160078074890644.698189757259456; Tue, 22 Sep 2020 06:19:08 -0700 (PDT) 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-69-tLSkwetcO5yaSddr0arinQ-1; Tue, 22 Sep 2020 09:19:04 -0400 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 5A58485C736; Tue, 22 Sep 2020 13:18:58 +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 2FFE41002C00; Tue, 22 Sep 2020 13:18:58 +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 E95B818A0C0B; Tue, 22 Sep 2020 13:18:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08MDIuIi023549 for ; Tue, 22 Sep 2020 09:18:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id EFAD255780; Tue, 22 Sep 2020 13:18:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C0EB55784 for ; Tue, 22 Sep 2020 13:18:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600780747; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=aTCpCgXRhHQBx3fwfaJgFAGt1YcPB4EbBVoAC6dC/eQ=; b=W+Fyb0AehVgeUzLpJ2neByVHdYmd2ozzOGQhvb6TiSlNIsskXJWM9mw0rwqBHMXcMqXQfr VBHWbVZas/+q2DPfIeP3zXdnIuOE25mwl43gUk6XGZD+v0WSGDP3HcNo6VRcnqYnrGVGYZ 1wbC6Cucv/xOoCgdtBdwq38BClAI8yQ= X-MC-Unique: tLSkwetcO5yaSddr0arinQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] tests: Don't advertise VIR_TEST_EXPENSIVE to users Date: Tue, 22 Sep 2020 15:18:49 +0200 Message-Id: <20200922131849.156111-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@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" Right now, the logic that takes care of deciding whether expensive tests should be run or not is not working correctly: more specifically, it's not possible to use something like $ VIR_TEST_EXPENSIVE=3D1 ninja test to override the default choice, because in meson.build we always pass an explicit value that overrides whatever is present in the environment. We could implement logic to make this work properly, but that would require some refactoring of our test infrastructure and is arguably of little value given that running $ meson build -Dexpensive_tests=3Denabled is very fast, so let's just stop telling users about the variable instead and call it a day. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- docs/advanced-tests.rst | 8 +------- meson_options.txt | 2 +- tests/test-lib.sh | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/advanced-tests.rst b/docs/advanced-tests.rst index 772fe1dd16..f17d8b0031 100644 --- a/docs/advanced-tests.rst +++ b/docs/advanced-tests.rst @@ -26,13 +26,7 @@ Some tests are skipped by default in a development envir= onment, based on the time they take in comparison to the likelihood that those tests will turn up problems during incremental builds. These tests default to being run when building from a -tarball or with the configure option -Dexpensive_tests=3Denabled; -you can also force a one-time toggle of these tests by setting -VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in: - -:: - - $ VIR_TEST_EXPENSIVE=3D1 ninja test +tarball or with the configure option -Dexpensive_tests=3Denabled. =20 If you encounter any failing tests, the VIR_TEST_DEBUG environment variable may provide extra information to debug the diff --git a/meson_options.txt b/meson_options.txt index f92c80553c..74de064384 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,7 +3,7 @@ option('packager', type: 'string', value: '', description: = 'Extra packager name' option('packager_version', type: 'string', value: '', description: 'Extra = packager version') option('system', type: 'boolean', value: false, description: 'Set install = paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') -option('expensive_tests', type: 'feature', value: 'auto', description: 'se= t the default for enabling expensive tests (long timeouts), use VIR_TEST_EX= PENSIVE to override') +option('expensive_tests', type: 'feature', value: 'auto', description: 'se= t the default for enabling expensive tests (long timeouts)') option('test_coverage', type: 'boolean', value: false, description: 'turn = on code coverage instrumentation') option('git_werror', type: 'feature', value: 'auto', description: 'use -We= rror if building from GIT') option('rpath', type: 'feature', value: 'auto', description: 'whether to i= nclude rpath information in installed binaries and libraries') diff --git a/tests/test-lib.sh b/tests/test-lib.sh index cc3924c07a..67065a9362 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -200,7 +200,7 @@ test_expensive() if test "$VIR_TEST_EXPENSIVE" !=3D 1; then skip_test_ ' This test is very expensive, so it is disabled by default. -To run it anyway, rerun: VIR_TEST_EXPENSIVE=3D1 ninja test +To change the default, configure with: meson -Dexpensive_tests=3Denabled ' fi } --=20 2.26.2