Skip to contentSkip to conversation

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

PATCH In review Philippe Mathieu-Daudé 2 participants 3 messages Dec 18, 2018 – Mar 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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).

---
 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%)
MAINTAINERS +1 -0
index 83c127f0d6..269427c3f3 100644
@@ -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
configure +1 -1
index 224d3071ac..8022f4b999 100755
@@ -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"
tests/check-qdict.c +1 -1
index a1e8305066..b5efa859b0 100644
@@ -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);
tests/data/qobject/qdict.txt renamed from qdict-test-data.txt +0 -0
similarity index 100%
rename from qdict-test-data.txt
rename to tests/data/qobject/qdict.txt
Signature · 1 line
2.17.2
#1 lore raw

Cc'ing qemu-trivial@

Quoted 57 lines · Philippe Mathieu-Daudé

Move qdict-test-data.txt to the tests/data/qobject/ subdirectory, and remove the unnecessary symlinking.
(See 4b2ff65a1f3 for similar test-data cleanup).

---
 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%)
MAINTAINERS +1 -0
index 83c127f0d6..269427c3f3 100644
@@ -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
configure +1 -1
index 224d3071ac..8022f4b999 100755
@@ -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"
tests/check-qdict.c +1 -1
index a1e8305066..b5efa859b0 100644
@@ -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);
tests/data/qobject/qdict.txt renamed from qdict-test-data.txt +0 -0
similarity index 100%
rename from qdict-test-data.txt
rename to tests/data/qobject/qdict.txt
Reviewed-by on v1 1/1
#2 lore raw
In reply to Philippe Mathieu-Daudé

I'm afraid I let this one fall through the cracks. qemu-trivial is fine with me.

Quoted 19 lines · Philippe Mathieu-Daudé

Move qdict-test-data.txt to the tests/data/qobject/ subdirectory, and remove the unnecessary symlinking.
(See 4b2ff65a1f3 for similar test-data cleanup).

---
 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%)
MAINTAINERS +0 -0
index 83c127f0d6..269427c3f3 100644

MAINTAINERS F: tests/check-qnum.c · line 1897

Quoted 7 lines
MAINTAINERS +1 -0
@@ -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.

tests/data/qobject/qdict.txt

Quoted 30 lines
configure +1 -1
index 224d3071ac..8022f4b999 100755
@@ -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"
tests/check-qdict.c +1 -1
index a1e8305066..b5efa859b0 100644
@@ -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);
tests/data/qobject/qdict.txt renamed from qdict-test-data.txt +0 -0
similarity index 100%
rename from qdict-test-data.txt
rename to tests/data/qobject/qdict.txt