qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Thomas Huth
Subject: [Qemu-devel] [PULL 1/7] tests: Move qdict-test-data.txt to tests/data/qobject/
Date: Fri, 8 Mar 2019 10:18:37 +0100

From: Philippe Mathieu-Daudé <address@hidden>

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 <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[thuth: Fix conflict in MAINTAINERS]
Signed-off-by: Thomas Huth <address@hidden>
---
 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]