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 49E98D44D54 for ; Wed, 6 Nov 2024 12:12:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8etO-0000AP-L0; Wed, 06 Nov 2024 07:12:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8etL-00005D-6P for qemu-devel@nongnu.org; Wed, 06 Nov 2024 07:12:08 -0500 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t8etF-00083A-69 for qemu-devel@nongnu.org; Wed, 06 Nov 2024 07:12:03 -0500 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0B4671FB47; Wed, 6 Nov 2024 12:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730895119; h=from:from:reply-to: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=FYb/u8+hN6QLScSdEcE6XKrbapqEen+/KOOmb41BIBM=; b=Q3ROuw2a5HvNl5nEQU2KrEyMYIJhrDysLeHKFTnpa/Ui7UJ3hSDi6s4JrTE0Fc/qkApRAe Ge15H5fue5ocDFrnIlH22PRLJlLryDB0YarSaL5mJ6NJTd0L5nWkS76l4V62WTHGdatzD7 OQRNidBWAK+aEcyyHokbgGufr7JYjkY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730895119; h=from:from:reply-to: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=FYb/u8+hN6QLScSdEcE6XKrbapqEen+/KOOmb41BIBM=; b=ppF/SqCgUwIYeLLIImzZM78/fLXrj18gF3wMmK7dgM+N2UYqLTIVv3YBRMsdcjNUboXwuK MgLbw/Vl8je4brDQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730895118; h=from:from:reply-to: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=FYb/u8+hN6QLScSdEcE6XKrbapqEen+/KOOmb41BIBM=; b=K93Xj0g/I6DjBYvFHOUp9Vn8fqfs+HahD9sjqzZPwPXIq4Yo3J7C6wL2xnJFXQLcOerFVs n3V+WXkuljnJGfn3WDeUwxEKKPatlquoT27Q+eBaKeX8dqE+VEuxiAt7EfqjRi7fJ92ofr kLG3a6kClpt88UsfozfD/EQsCxrIJwA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730895118; h=from:from:reply-to: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=FYb/u8+hN6QLScSdEcE6XKrbapqEen+/KOOmb41BIBM=; b=+JoZREwJMITZWWHTtq4lU5ioDx7pha/6MMYeqft4MQp+wGUFM9M9S0+bqmKy1SHR94q7qA v8wjqLtq6PKCugBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 88682137C4; Wed, 6 Nov 2024 12:11:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id bf7aEw1dK2e6CQAAD6G6ig (envelope-from ); Wed, 06 Nov 2024 12:11:57 +0000 From: Fabiano Rosas To: =?utf-8?Q?Daniel_P=2E_Berrang=C3=A9?= Cc: qemu-devel@nongnu.org, Peter Xu , Peter Maydell , Alex =?utf-8?Q?Benn=C3=A9e?= Subject: Re: [PATCH 04/22] tests/migration: Disambiguate guestperf vs. a-b In-Reply-To: References: <20241105180837.5990-1-farosas@suse.de> <20241105180837.5990-5-farosas@suse.de> Date: Wed, 06 Nov 2024 09:11:55 -0300 Message-ID: <8734k436k4.fsf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[nongnu.org:url, suse.de:email, suse.de:mid, imap1.dmz-prg2.suse.org:helo] Received-SPF: pass client-ip=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Daniel P. Berrang=C3=A9 writes: > On Tue, Nov 05, 2024 at 03:08:19PM -0300, Fabiano Rosas wrote: >> The current build structure for migration tests is confusing. There is >> the tests/migration directory, which contains two different guest code >> implementations, one for the qtests (a-b-{bootblock|kernel}.S) and >> another for the guestperf script (stress.c). One uses a Makefile, >> while the other uses meson. >>=20 >> The next patches will add a new qtests/migration/ directory to hold >> qtest code which will make the situation even more confusing. >>=20 >> Move the guest code used by qtests into a new qtests/migration/ >> directory and rename the old one to tests/migration-stress. > > NB, this clashes with this proposed series > > https://lists.nongnu.org/archive/html/qemu-devel/2024-10/msg03911.html Yes, I'm considering moving stress.c into scripts/migration/ as well and getting rid of the tests/migration/ directory. > >>=20 >> Signed-off-by: Fabiano Rosas >> --- >> tests/meson.build | 2 +- >> .../{migration =3D> migration-stress}/guestperf-batch.py | 0 >> .../{migration =3D> migration-stress}/guestperf-plot.py | 0 >> tests/{migration =3D> migration-stress}/guestperf.py | 0 >> .../guestperf/__init__.py | 0 >> .../guestperf/comparison.py | 0 >> .../guestperf/engine.py | 0 >> .../guestperf/hardware.py | 0 >> .../{migration =3D> migration-stress}/guestperf/plot.py | 0 >> .../guestperf/progress.py | 0 >> .../guestperf/report.py | 0 >> .../guestperf/scenario.py | 0 >> .../{migration =3D> migration-stress}/guestperf/shell.py | 0 >> .../guestperf/timings.py | 0 >> tests/{migration =3D> migration-stress}/initrd-stress.sh | 0 >> tests/{migration =3D> migration-stress}/meson.build | 0 >> tests/{migration =3D> migration-stress}/stress.c | 0 >> tests/qtest/migration-test.c | 10 +++++----- >> tests/{ =3D> qtest}/migration/Makefile | 0 >> tests/{ =3D> qtest}/migration/aarch64/Makefile | 0 >> tests/{ =3D> qtest}/migration/aarch64/a-b-kernel.S | 0 >> tests/{ =3D> qtest}/migration/aarch64/a-b-kernel.h | 0 >> tests/{ =3D> qtest}/migration/i386/Makefile | 0 >> tests/{ =3D> qtest}/migration/i386/a-b-bootblock.S | 0 >> tests/{ =3D> qtest}/migration/i386/a-b-bootblock.h | 0 >> tests/{ =3D> qtest}/migration/migration-test.h | 0 >> tests/{ =3D> qtest}/migration/ppc64/Makefile | 0 >> tests/{ =3D> qtest}/migration/ppc64/a-b-kernel.S | 0 >> tests/{ =3D> qtest}/migration/ppc64/a-b-kernel.h | 0 >> tests/{ =3D> qtest}/migration/s390x/Makefile | 0 >> tests/{ =3D> qtest}/migration/s390x/a-b-bios.c | 0 >> tests/{ =3D> qtest}/migration/s390x/a-b-bios.h | 0 >> 32 files changed, 6 insertions(+), 6 deletions(-) >> rename tests/{migration =3D> migration-stress}/guestperf-batch.py (100%) >> rename tests/{migration =3D> migration-stress}/guestperf-plot.py (100%) >> rename tests/{migration =3D> migration-stress}/guestperf.py (100%) >> rename tests/{migration =3D> migration-stress}/guestperf/__init__.py (1= 00%) >> rename tests/{migration =3D> migration-stress}/guestperf/comparison.py = (100%) >> rename tests/{migration =3D> migration-stress}/guestperf/engine.py (100= %) >> rename tests/{migration =3D> migration-stress}/guestperf/hardware.py (1= 00%) >> rename tests/{migration =3D> migration-stress}/guestperf/plot.py (100%) >> rename tests/{migration =3D> migration-stress}/guestperf/progress.py (1= 00%) >> rename tests/{migration =3D> migration-stress}/guestperf/report.py (100= %) >> rename tests/{migration =3D> migration-stress}/guestperf/scenario.py (1= 00%) >> rename tests/{migration =3D> migration-stress}/guestperf/shell.py (100%) >> rename tests/{migration =3D> migration-stress}/guestperf/timings.py (10= 0%) >> rename tests/{migration =3D> migration-stress}/initrd-stress.sh (100%) >> rename tests/{migration =3D> migration-stress}/meson.build (100%) >> rename tests/{migration =3D> migration-stress}/stress.c (100%) >> rename tests/{ =3D> qtest}/migration/Makefile (100%) >> rename tests/{ =3D> qtest}/migration/aarch64/Makefile (100%) >> rename tests/{ =3D> qtest}/migration/aarch64/a-b-kernel.S (100%) >> rename tests/{ =3D> qtest}/migration/aarch64/a-b-kernel.h (100%) >> rename tests/{ =3D> qtest}/migration/i386/Makefile (100%) >> rename tests/{ =3D> qtest}/migration/i386/a-b-bootblock.S (100%) >> rename tests/{ =3D> qtest}/migration/i386/a-b-bootblock.h (100%) >> rename tests/{ =3D> qtest}/migration/migration-test.h (100%) >> rename tests/{ =3D> qtest}/migration/ppc64/Makefile (100%) >> rename tests/{ =3D> qtest}/migration/ppc64/a-b-kernel.S (100%) >> rename tests/{ =3D> qtest}/migration/ppc64/a-b-kernel.h (100%) >> rename tests/{ =3D> qtest}/migration/s390x/Makefile (100%) >> rename tests/{ =3D> qtest}/migration/s390x/a-b-bios.c (100%) >> rename tests/{ =3D> qtest}/migration/s390x/a-b-bios.h (100%) >>=20 >> diff --git a/tests/meson.build b/tests/meson.build >> index 907a4c1c98..f96c1be574 100644 >> --- a/tests/meson.build >> +++ b/tests/meson.build >> @@ -84,5 +84,5 @@ endif >> subdir('unit') >> subdir('qapi-schema') >> subdir('qtest') >> -subdir('migration') >> +subdir('migration-stress') >> subdir('functional') >> diff --git a/tests/migration/guestperf-batch.py b/tests/migration-stress= /guestperf-batch.py >> similarity index 100% >> rename from tests/migration/guestperf-batch.py >> rename to tests/migration-stress/guestperf-batch.py >> diff --git a/tests/migration/guestperf-plot.py b/tests/migration-stress/= guestperf-plot.py >> similarity index 100% >> rename from tests/migration/guestperf-plot.py >> rename to tests/migration-stress/guestperf-plot.py >> diff --git a/tests/migration/guestperf.py b/tests/migration-stress/guest= perf.py >> similarity index 100% >> rename from tests/migration/guestperf.py >> rename to tests/migration-stress/guestperf.py >> diff --git a/tests/migration/guestperf/__init__.py b/tests/migration-str= ess/guestperf/__init__.py >> similarity index 100% >> rename from tests/migration/guestperf/__init__.py >> rename to tests/migration-stress/guestperf/__init__.py >> diff --git a/tests/migration/guestperf/comparison.py b/tests/migration-s= tress/guestperf/comparison.py >> similarity index 100% >> rename from tests/migration/guestperf/comparison.py >> rename to tests/migration-stress/guestperf/comparison.py >> diff --git a/tests/migration/guestperf/engine.py b/tests/migration-stres= s/guestperf/engine.py >> similarity index 100% >> rename from tests/migration/guestperf/engine.py >> rename to tests/migration-stress/guestperf/engine.py >> diff --git a/tests/migration/guestperf/hardware.py b/tests/migration-str= ess/guestperf/hardware.py >> similarity index 100% >> rename from tests/migration/guestperf/hardware.py >> rename to tests/migration-stress/guestperf/hardware.py >> diff --git a/tests/migration/guestperf/plot.py b/tests/migration-stress/= guestperf/plot.py >> similarity index 100% >> rename from tests/migration/guestperf/plot.py >> rename to tests/migration-stress/guestperf/plot.py >> diff --git a/tests/migration/guestperf/progress.py b/tests/migration-str= ess/guestperf/progress.py >> similarity index 100% >> rename from tests/migration/guestperf/progress.py >> rename to tests/migration-stress/guestperf/progress.py >> diff --git a/tests/migration/guestperf/report.py b/tests/migration-stres= s/guestperf/report.py >> similarity index 100% >> rename from tests/migration/guestperf/report.py >> rename to tests/migration-stress/guestperf/report.py >> diff --git a/tests/migration/guestperf/scenario.py b/tests/migration-str= ess/guestperf/scenario.py >> similarity index 100% >> rename from tests/migration/guestperf/scenario.py >> rename to tests/migration-stress/guestperf/scenario.py >> diff --git a/tests/migration/guestperf/shell.py b/tests/migration-stress= /guestperf/shell.py >> similarity index 100% >> rename from tests/migration/guestperf/shell.py >> rename to tests/migration-stress/guestperf/shell.py >> diff --git a/tests/migration/guestperf/timings.py b/tests/migration-stre= ss/guestperf/timings.py >> similarity index 100% >> rename from tests/migration/guestperf/timings.py >> rename to tests/migration-stress/guestperf/timings.py >> diff --git a/tests/migration/initrd-stress.sh b/tests/migration-stress/i= nitrd-stress.sh >> similarity index 100% >> rename from tests/migration/initrd-stress.sh >> rename to tests/migration-stress/initrd-stress.sh >> diff --git a/tests/migration/meson.build b/tests/migration-stress/meson.= build >> similarity index 100% >> rename from tests/migration/meson.build >> rename to tests/migration-stress/meson.build >> diff --git a/tests/migration/stress.c b/tests/migration-stress/stress.c >> similarity index 100% >> rename from tests/migration/stress.c >> rename to tests/migration-stress/stress.c >> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c >> index a40451df1e..61c8cf043f 100644 >> --- a/tests/qtest/migration-test.c >> +++ b/tests/qtest/migration-test.c >> @@ -24,7 +24,7 @@ >> #include "ppc-util.h" >>=20=20 >> #include "migration-helpers.h" >> -#include "tests/migration/migration-test.h" >> +#include "migration/migration-test.h" >> #ifdef CONFIG_GNUTLS >> # include "tests/unit/crypto-tls-psk-helpers.h" >> # ifdef CONFIG_TASN1 >> @@ -138,10 +138,10 @@ static char *bootpath; >> /* The boot file modifies memory area in [start_address, end_address) >> * repeatedly. It outputs a 'B' at a fixed rate while it's still runnin= g. >> */ >> -#include "tests/migration/i386/a-b-bootblock.h" >> -#include "tests/migration/aarch64/a-b-kernel.h" >> -#include "tests/migration/ppc64/a-b-kernel.h" >> -#include "tests/migration/s390x/a-b-bios.h" >> +#include "migration/i386/a-b-bootblock.h" >> +#include "migration/aarch64/a-b-kernel.h" >> +#include "migration/ppc64/a-b-kernel.h" >> +#include "migration/s390x/a-b-bios.h" >>=20=20 >> static void bootfile_delete(void) >> { >> diff --git a/tests/migration/Makefile b/tests/qtest/migration/Makefile >> similarity index 100% >> rename from tests/migration/Makefile >> rename to tests/qtest/migration/Makefile >> diff --git a/tests/migration/aarch64/Makefile b/tests/qtest/migration/aa= rch64/Makefile >> similarity index 100% >> rename from tests/migration/aarch64/Makefile >> rename to tests/qtest/migration/aarch64/Makefile >> diff --git a/tests/migration/aarch64/a-b-kernel.S b/tests/qtest/migratio= n/aarch64/a-b-kernel.S >> similarity index 100% >> rename from tests/migration/aarch64/a-b-kernel.S >> rename to tests/qtest/migration/aarch64/a-b-kernel.S >> diff --git a/tests/migration/aarch64/a-b-kernel.h b/tests/qtest/migratio= n/aarch64/a-b-kernel.h >> similarity index 100% >> rename from tests/migration/aarch64/a-b-kernel.h >> rename to tests/qtest/migration/aarch64/a-b-kernel.h >> diff --git a/tests/migration/i386/Makefile b/tests/qtest/migration/i386/= Makefile >> similarity index 100% >> rename from tests/migration/i386/Makefile >> rename to tests/qtest/migration/i386/Makefile >> diff --git a/tests/migration/i386/a-b-bootblock.S b/tests/qtest/migratio= n/i386/a-b-bootblock.S >> similarity index 100% >> rename from tests/migration/i386/a-b-bootblock.S >> rename to tests/qtest/migration/i386/a-b-bootblock.S >> diff --git a/tests/migration/i386/a-b-bootblock.h b/tests/qtest/migratio= n/i386/a-b-bootblock.h >> similarity index 100% >> rename from tests/migration/i386/a-b-bootblock.h >> rename to tests/qtest/migration/i386/a-b-bootblock.h >> diff --git a/tests/migration/migration-test.h b/tests/qtest/migration/mi= gration-test.h >> similarity index 100% >> rename from tests/migration/migration-test.h >> rename to tests/qtest/migration/migration-test.h >> diff --git a/tests/migration/ppc64/Makefile b/tests/qtest/migration/ppc6= 4/Makefile >> similarity index 100% >> rename from tests/migration/ppc64/Makefile >> rename to tests/qtest/migration/ppc64/Makefile >> diff --git a/tests/migration/ppc64/a-b-kernel.S b/tests/qtest/migration/= ppc64/a-b-kernel.S >> similarity index 100% >> rename from tests/migration/ppc64/a-b-kernel.S >> rename to tests/qtest/migration/ppc64/a-b-kernel.S >> diff --git a/tests/migration/ppc64/a-b-kernel.h b/tests/qtest/migration/= ppc64/a-b-kernel.h >> similarity index 100% >> rename from tests/migration/ppc64/a-b-kernel.h >> rename to tests/qtest/migration/ppc64/a-b-kernel.h >> diff --git a/tests/migration/s390x/Makefile b/tests/qtest/migration/s390= x/Makefile >> similarity index 100% >> rename from tests/migration/s390x/Makefile >> rename to tests/qtest/migration/s390x/Makefile >> diff --git a/tests/migration/s390x/a-b-bios.c b/tests/qtest/migration/s3= 90x/a-b-bios.c >> similarity index 100% >> rename from tests/migration/s390x/a-b-bios.c >> rename to tests/qtest/migration/s390x/a-b-bios.c >> diff --git a/tests/migration/s390x/a-b-bios.h b/tests/qtest/migration/s3= 90x/a-b-bios.h >> similarity index 100% >> rename from tests/migration/s390x/a-b-bios.h >> rename to tests/qtest/migration/s390x/a-b-bios.h >> --=20 >> 2.35.3 >>=20 > > With regards, > Daniel