diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2018-12-18 12:37:17 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-03-07 22:05:54 +0100 |
| commit | fe07b62c8c4fcaadb039fab0de3541b4574ec3dc (patch) | |
| tree | 108ff9b0b7cae12489df2762b0df02489ec5cfce | |
| parent | 6cb4f6db4f4367faa33da85b15f75bbbd2bed2a6 (diff) | |
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 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>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tests/check-qdict.c | 2 | ||||
| -rw-r--r-- | tests/data/qobject/qdict.txt (renamed from qdict-test-data.txt) | 0 |
4 files changed, 3 insertions, 3 deletions
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 @@ -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 index 122fda4524..122fda4524 100644 --- a/qdict-test-data.txt +++ b/tests/data/qobject/qdict.txt |