Daniel P. Berrangé <berra...@redhat.com> 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.
>>
>> The next patches will add a new qtests/migration/ directory to hold
>> qtest code which will make the situation even more confusing.
>>
>> 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.
>
>>
>> Signed-off-by: Fabiano Rosas <faro...@suse.de>
>> ---
>> tests/meson.build | 2 +-
>> .../{migration => migration-stress}/guestperf-batch.py | 0
>> .../{migration => migration-stress}/guestperf-plot.py | 0
>> tests/{migration => migration-stress}/guestperf.py | 0
>> .../guestperf/__init__.py | 0
>> .../guestperf/comparison.py | 0
>> .../guestperf/engine.py | 0
>> .../guestperf/hardware.py | 0
>> .../{migration => migration-stress}/guestperf/plot.py | 0
>> .../guestperf/progress.py | 0
>> .../guestperf/report.py | 0
>> .../guestperf/scenario.py | 0
>> .../{migration => migration-stress}/guestperf/shell.py | 0
>> .../guestperf/timings.py | 0
>> tests/{migration => migration-stress}/initrd-stress.sh | 0
>> tests/{migration => migration-stress}/meson.build | 0
>> tests/{migration => migration-stress}/stress.c | 0
>> tests/qtest/migration-test.c | 10 +++++-----
>> tests/{ => qtest}/migration/Makefile | 0
>> tests/{ => qtest}/migration/aarch64/Makefile | 0
>> tests/{ => qtest}/migration/aarch64/a-b-kernel.S | 0
>> tests/{ => qtest}/migration/aarch64/a-b-kernel.h | 0
>> tests/{ => qtest}/migration/i386/Makefile | 0
>> tests/{ => qtest}/migration/i386/a-b-bootblock.S | 0
>> tests/{ => qtest}/migration/i386/a-b-bootblock.h | 0
>> tests/{ => qtest}/migration/migration-test.h | 0
>> tests/{ => qtest}/migration/ppc64/Makefile | 0
>> tests/{ => qtest}/migration/ppc64/a-b-kernel.S | 0
>> tests/{ => qtest}/migration/ppc64/a-b-kernel.h | 0
>> tests/{ => qtest}/migration/s390x/Makefile | 0
>> tests/{ => qtest}/migration/s390x/a-b-bios.c | 0
>> tests/{ => qtest}/migration/s390x/a-b-bios.h | 0
>> 32 files changed, 6 insertions(+), 6 deletions(-)
>> rename tests/{migration => migration-stress}/guestperf-batch.py (100%)
>> rename tests/{migration => migration-stress}/guestperf-plot.py (100%)
>> rename tests/{migration => migration-stress}/guestperf.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/__init__.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/comparison.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/engine.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/hardware.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/plot.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/progress.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/report.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/scenario.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/shell.py (100%)
>> rename tests/{migration => migration-stress}/guestperf/timings.py (100%)
>> rename tests/{migration => migration-stress}/initrd-stress.sh (100%)
>> rename tests/{migration => migration-stress}/meson.build (100%)
>> rename tests/{migration => migration-stress}/stress.c (100%)
>> rename tests/{ => qtest}/migration/Makefile (100%)
>> rename tests/{ => qtest}/migration/aarch64/Makefile (100%)
>> rename tests/{ => qtest}/migration/aarch64/a-b-kernel.S (100%)
>> rename tests/{ => qtest}/migration/aarch64/a-b-kernel.h (100%)
>> rename tests/{ => qtest}/migration/i386/Makefile (100%)
>> rename tests/{ => qtest}/migration/i386/a-b-bootblock.S (100%)
>> rename tests/{ => qtest}/migration/i386/a-b-bootblock.h (100%)
>> rename tests/{ => qtest}/migration/migration-test.h (100%)
>> rename tests/{ => qtest}/migration/ppc64/Makefile (100%)
>> rename tests/{ => qtest}/migration/ppc64/a-b-kernel.S (100%)
>> rename tests/{ => qtest}/migration/ppc64/a-b-kernel.h (100%)
>> rename tests/{ => qtest}/migration/s390x/Makefile (100%)
>> rename tests/{ => qtest}/migration/s390x/a-b-bios.c (100%)
>> rename tests/{ => qtest}/migration/s390x/a-b-bios.h (100%)
>>
>> 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/guestperf.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-stress/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-stress/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-stress/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-stress/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-stress/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-stress/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-stress/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-stress/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/initrd-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"
>>
>> #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 running.
>> */
>> -#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"
>>
>> 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/aarch64/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/migration/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/migration/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/migration/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/migration/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/migration-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/ppc64/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/s390x/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/s390x/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/s390x/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
>> --
>> 2.35.3
>>
>
> With regards,
> Daniel
