From fe07b62c8c4fcaadb039fab0de3541b4574ec3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:37:17 +0100 Subject: [PATCH] tests: Move qdict-test-data.txt to tests/data/qobject/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster [thuth: Fix conflict in MAINTAINERS] Signed-off-by: Thomas Huth --- 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 074ad46d47..2344215aa2 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 5921d08cb3..b970bc4356 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 a1e8305066..b5efa859b0 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