tests: Move qdict-test-data.txt to tests/data/qobject/

Move qdict-test-data.txt to the tests/data/qobject/ subdirectory,
and remove the unnecessary symlinking.
(See 4b2ff65a1f 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>
This commit is contained in:
Philippe Mathieu-Daudé 2018-12-18 12:37:17 +01:00 committed by Thomas Huth
parent 6cb4f6db4f
commit fe07b62c8c
4 changed files with 3 additions and 3 deletions

View File

@ -1965,7 +1965,7 @@ F: tests/check-qnull.c
F: tests/check-qnum.c F: tests/check-qnum.c
F: tests/check-qobject.c F: tests/check-qobject.c
F: tests/check-qstring.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 T: git https://repo.or.cz/qemu/armbru.git qapi-next
QEMU Guest Agent QEMU Guest Agent

2
configure vendored
View File

@ -7662,7 +7662,7 @@ DIRS="$DIRS tests/fp"
DIRS="$DIRS docs docs/interop fsdev scsi" DIRS="$DIRS docs docs/interop fsdev scsi"
DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
DIRS="$DIRS roms/seabios roms/vgabios" 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/cris/Makefile tests/tcg/cris/.gdbinit"
LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile" LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile"
LINKS="$LINKS tests/fp/Makefile" LINKS="$LINKS tests/fp/Makefile"

View File

@ -291,7 +291,7 @@ static void qdict_stress_test(void)
FILE *test_file; FILE *test_file;
QDict *qdict; QDict *qdict;
QString *value; 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"); test_file = fopen(test_file_path, "r");
g_assert(test_file != NULL); g_assert(test_file != NULL);