I'm afraid I let this one fall through the cracks. qemu-trivial is fine with me.
Philippe Mathieu-Daudé <[email protected]> writes: > 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 <[email protected]> > Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > --- > MAINTAINERS | 1 + > configure | 2 +- > tests/check-qdict.c | 2 +- > qdict-test-data.txt => tests/data/qobject/qdict.txt | 0 > 4 files changed, 3 insertions(+), 2 deletions(-) > rename qdict-test-data.txt => tests/data/qobject/qdict.txt (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 83c127f0d6..269427c3f3 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1891,6 +1891,7 @@ F: tests/check-qnum.c > F: tests/check-qjson.c > F: tests/check-qlist.c > F: tests/check-qstring.c > +F: tests/data/qobject/qdict.txt > T: git https://repo.or.cz/qemu/armbru.git qapi-next > > QEMU Guest Agent Trivial conflict with your commit cd81e02b1e4. > diff --git a/configure b/configure > index 224d3071ac..8022f4b999 100755 > --- a/configure > +++ b/configure > @@ -7534,7 +7534,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 Reviewed-by: Markus Armbruster <[email protected]>
