From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4183BC433F5 for ; Wed, 20 Apr 2022 16:28:58 +0000 (UTC) Received: from localhost ([::1]:49792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhDCL-0002tp-6d for qemu-devel@archiver.kernel.org; Wed, 20 Apr 2022 12:28:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhCZ1-0002fO-Rs for qemu-devel@nongnu.org; Wed, 20 Apr 2022 11:48:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhCYz-0003F7-Ox for qemu-devel@nongnu.org; Wed, 20 Apr 2022 11:48:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650469697; h=from:from:reply-to: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; bh=/mkQjkeWSwhwCczAxErCZlcDU+m90iyFNUIes3ZIvJk=; b=GAyxEMcu+1wHG74CukooEJwI47NO/GXkTPRm7AQBstyQrxaDote6FTMvGL96qaZEiay0oW HWrAvT61VVXlLAY1RkyyUa1pVeHzLG+zF6CNASCmQQyePo85mMeuRsRIPDyO+J0YMm2+gr J542NhyMenNlGwmYM/0unQsO1Lj8xSo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-286-vslKyu9hOVy_8pSVe2j_IQ-1; Wed, 20 Apr 2022 11:48:15 -0400 X-MC-Unique: vslKyu9hOVy_8pSVe2j_IQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D454185A794 for ; Wed, 20 Apr 2022 15:48:15 +0000 (UTC) Received: from redhat.com (unknown [10.33.36.162]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B9EF82024CB6; Wed, 20 Apr 2022 15:48:14 +0000 (UTC) Date: Wed, 20 Apr 2022 16:48:12 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: marcandre.lureau@redhat.com Subject: Re: [PATCH 33/41] tests: move libqtest.c under libqos/ Message-ID: References: <20220420132624.2439741-1-marcandre.lureau@redhat.com> <20220420132624.2439741-34-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220420132624.2439741-34-marcandre.lureau@redhat.com> User-Agent: Mutt/2.1.5 (2021-12-30) X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Apr 20, 2022 at 05:26:16PM +0400, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Since commit a2ce7dbd917 ("meson: convert tests/qtest to meson"), > libqtest.h is under libqos/ directory. Let's move the .c along with it. It is a bit odd for libqtest.h to be under libqos to begin with IMHO. The commit doesn't explain why it was moved, so feels like possibly a mistake. > > Signed-off-by: Marc-André Lureau > --- > docs/devel/qtest.rst | 4 ++-- > tests/qtest/{ => libqos}/libqtest.c | 4 ++-- > tests/qtest/libqos/meson.build | 2 +- > tests/unit/meson.build | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > rename tests/qtest/{ => libqos}/libqtest.c (99%) > > diff --git a/docs/devel/qtest.rst b/docs/devel/qtest.rst > index c3dceb6c8a1d..a9a6b0a7466b 100644 > --- a/docs/devel/qtest.rst > +++ b/docs/devel/qtest.rst > @@ -18,8 +18,8 @@ QTest cases can be executed with > > make check-qtest > > -The QTest library is implemented by ``tests/qtest/libqtest.c`` and the API is > -defined in ``tests/qtest/libqtest.h``. > +The QTest library is implemented by ``tests/qtest/libqos/libqtest.c`` and the API is > +defined in ``tests/qtest/libqos/libqtest.h``. > > Consider adding a new QTest case when you are introducing a new virtual > hardware, or extending one if you are adding functionalities to an existing > diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqos/libqtest.c > similarity index 99% > rename from tests/qtest/libqtest.c > rename to tests/qtest/libqos/libqtest.c > index 2b9bdb947d6f..9097329ce435 100644 > --- a/tests/qtest/libqtest.c > +++ b/tests/qtest/libqos/libqtest.c > @@ -20,7 +20,7 @@ > #include > #include > > -#include "libqos/libqtest.h" > +#include "libqtest.h" > #include "qemu/ctype.h" > #include "qemu/cutils.h" > #include "qapi/error.h" > @@ -268,7 +268,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) > /* It's possible that if an earlier test run crashed it might > * have left a stale unix socket lying around. Delete any > * stale old socket to avoid spurious test failures with > - * tests/libqtest.c:70:init_socket: assertion failed (ret != -1): (-1 != -1) > + * libqtest.c:70:init_socket: assertion failed (ret != -1): (-1 != -1) > */ > unlink(socket_path); > unlink(qmp_socket_path); > diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build > index e988d1579172..0c172f27533a 100644 > --- a/tests/qtest/libqos/meson.build > +++ b/tests/qtest/libqos/meson.build > @@ -1,4 +1,4 @@ > -libqos_srcs = files('../libqtest.c', > +libqos_srcs = files('libqtest.c', > 'qgraph.c', > 'qos_external.c', > 'pci.c', > diff --git a/tests/unit/meson.build b/tests/unit/meson.build > index ab01e00f12cf..188b0ea80c37 100644 > --- a/tests/unit/meson.build > +++ b/tests/unit/meson.build > @@ -154,7 +154,7 @@ if have_system > endif > > if have_ga and targetos == 'linux' > - tests += {'test-qga': ['../qtest/libqtest.c']} > + tests += {'test-qga': ['../qtest/libqos/libqtest.c']} > test_deps += {'test-qga': qga} > endif > > -- > 2.35.1.693.g805e0a68082a > > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|