1. Patchew
  2. QEMU
  3. [Qemu-devel] [PULL 0/7] qtests, clean-ups and macOS CI testing
  4. View patch

[Qemu-devel] [PULL 1/7] tests: Move qdict-test-data.txt to tests/data/qobject/

Thomas Huth posted 7 patches 6 years, 8 months ago
Maintainers: Aurelien Jarno <aurelien@aurel32.net>, BALATON Zoltan <balaton@eik.bme.hu>, Gerd Hoffmann <kraxel@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Michael Walle <michael@walle.cc>, Andrzej Zaborowski <balrogg@gmail.com>, Laurent Vivier <lvivier@redhat.com>, Jason Wang <jasowang@redhat.com>, Helge Deller <deller@gmx.de>, Li-Wen Hsu <lwhsu@freebsd.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Magnus Damm <magnus.damm@gmail.com>, Kevin Wolf <kwolf@redhat.com>, Markus Armbruster <armbru@redhat.com>, David Gibson <david@gibson.dropbear.id.au>, Stefan Hajnoczi <stefanha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Ed Maste <emaste@freebsd.org>, Thomas Huth <thuth@redhat.com>, Rob Herring <robh@kernel.org>, Joel Stanley <joel@jms.id.au>, Jan Kiszka <jan.kiszka@web.de>, "Michael S. Tsirkin" <mst@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Beniamino Galvani <b.galvani@gmail.com>, Richard Henderson <rth@twiddle.net>
[Qemu-devel] [PULL 1/7] tests: Move qdict-test-data.txt to tests/data/qobject/
Posted by Thomas Huth 6 years, 8 months ago 
From: Philippe Mathieu-Daudé <philmd@redhat.com>

Move qdict-test-data.txt to the tests/data/qobject/ subdirectory,
and remove the unnecessary symlinking.
(See 4b2ff65a1f3 for similar test-data cleanup).

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[thuth: Fix conflict in MAINTAINERS]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS                                         | 2 +-
 configure                                           | 2 +-
 tests/check-qdict.c                                 | 2 +-
 qdict-test-data.txt => tests/data/qobject/qdict.txt | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename qdict-test-data.txt => tests/data/qobject/qdict.txt (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 074ad46..2344215 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1965,7 +1965,7 @@ F: tests/check-qnull.c
 F: tests/check-qnum.c
 F: tests/check-qobject.c
 F: tests/check-qstring.c
-F: qdict-test-data.txt
+F: tests/data/qobject/qdict.txt
 T: git https://repo.or.cz/qemu/armbru.git qapi-next
 
 QEMU Guest Agent
diff --git a/configure b/configure
index 5921d08..b970bc4 100755
--- a/configure
+++ b/configure
@@ -7662,7 +7662,7 @@ DIRS="$DIRS tests/fp"
 DIRS="$DIRS docs docs/interop fsdev scsi"
 DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
 DIRS="$DIRS roms/seabios roms/vgabios"
-LINKS="Makefile tests/tcg/Makefile qdict-test-data.txt"
+LINKS="Makefile tests/tcg/Makefile"
 LINKS="$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
 LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile"
 LINKS="$LINKS tests/fp/Makefile"
diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index a1e8305..b5efa85 100644
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -291,7 +291,7 @@ static void qdict_stress_test(void)
     FILE *test_file;
     QDict *qdict;
     QString *value;
-    const char *test_file_path = "qdict-test-data.txt";
+    const char *test_file_path = "tests/data/qobject/qdict.txt";
 
     test_file = fopen(test_file_path, "r");
     g_assert(test_file != NULL);
diff --git a/qdict-test-data.txt b/tests/data/qobject/qdict.txt
similarity index 100%
rename from qdict-test-data.txt
rename to tests/data/qobject/qdict.txt
-- 
1.8.3.1

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.