test: merge installed_files.txt into test.json

6 files changed, 52 insertions, 40 deletions

diff --git a/test cases/windows/1 basic/installed_files.txt b/test cases/windows/1 basic/installed_files.txt
deleted file mode 100644
index 5022d2870..000000000
--- a/test cases/windows/1 basic/installed_files.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/prog.exe
-?msvc:usr/bin/prog.pdb
diff --git a/test cases/windows/1 basic/test.json b/test cases/windows/1 basic/test.json
new file mode 100644
index 000000000..650a6e208
--- /dev/null
+++ b/test cases/windows/1 basic/test.json
@@ -0,0 +1,6 @@
+{
+  "installed": [
+    {"type": "file", "file": "usr/bin/prog.exe"},
+    {"type": "pdb", "file": "usr/bin/prog"}
+  ]
+}
diff --git a/test cases/windows/11 exe implib/installed_files.txt b/test cases/windows/11 exe implib/installed_files.txt
deleted file mode 100644
index b1e805c64..000000000
--- a/test cases/windows/11 exe implib/installed_files.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin/prog.exe
-?msvc:usr/bin/prog.pdb
-usr/bin/prog2.exe
-?msvc:usr/bin/prog2.pdb
-?gcc:usr/lib/libprog.exe.a
-?gcc:usr/lib/libburble.a
-?msvc:usr/lib/prog.exe.lib
-?msvc:usr/lib/burble.lib
diff --git a/test cases/windows/11 exe implib/test.json b/test cases/windows/11 exe implib/test.json
new file mode 100644
index 000000000..f71956838
--- /dev/null
+++ b/test cases/windows/11 exe implib/test.json
@@ -0,0 +1,12 @@
+{
+  "installed": [
+    {"type": "file", "file": "usr/bin/prog.exe"},
+    {"type": "pdb", "file": "usr/bin/prog"},
+    {"type": "file", "file": "usr/bin/prog2.exe"},
+    {"type": "pdb", "file": "usr/bin/prog2"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libprog.exe.a"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libburble.a"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/prog.exe.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/burble.lib"}
+  ]
+}
diff --git a/test cases/windows/7 dll versioning/installed_files.txt b/test cases/windows/7 dll versioning/installed_files.txt
deleted file mode 100644
index f3a1e2d98..000000000
--- a/test cases/windows/7 dll versioning/installed_files.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-?msvc:usr/bin/some-0.dll
-?msvc:usr/bin/some-0.pdb
-?msvc:usr/lib/some.lib
-?msvc:usr/bin/noversion.dll
-?msvc:usr/bin/noversion.pdb
-?msvc:usr/lib/noversion.lib
-?msvc:usr/bin/onlyversion-1.dll
-?msvc:usr/bin/onlyversion-1.pdb
-?msvc:usr/lib/onlyversion.lib
-?msvc:usr/bin/onlysoversion-5.dll
-?msvc:usr/bin/onlysoversion-5.pdb
-?msvc:usr/lib/onlysoversion.lib
-?msvc:usr/libexec/customdir.dll
-?msvc:usr/libexec/customdir.lib
-?msvc:usr/libexec/customdir.pdb
-?msvc:usr/lib/modules/module.dll
-?msvc:usr/lib/modules/module.lib
-?msvc:usr/lib/modules/module.pdb
-?gcc:usr/bin/?libsome-0.dll
-?gcc:usr/lib/libsome.dll.a
-?gcc:usr/bin/?libnoversion.dll
-?gcc:usr/lib/libnoversion.dll.a
-?gcc:usr/bin/?libonlyversion-1.dll
-?gcc:usr/lib/libonlyversion.dll.a
-?gcc:usr/bin/?libonlysoversion-5.dll
-?gcc:usr/lib/libonlysoversion.dll.a
-?gcc:usr/libexec/?libcustomdir.dll
-?gcc:usr/libexec/libcustomdir.dll.a
-?gcc:usr/lib/modules/?libmodule.dll
-?gcc:usr/lib/modules/libmodule.dll.a
diff --git a/test cases/windows/7 dll versioning/test.json b/test cases/windows/7 dll versioning/test.json
new file mode 100644
index 000000000..14029254f
--- /dev/null
+++ b/test cases/windows/7 dll versioning/test.json
@@ -0,0 +1,34 @@
+{
+  "installed": [
+    {"type": "file", "platform": "msvc", "file": "usr/bin/some-0.dll"},
+    {"type": "pdb", "file": "usr/bin/some-0"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/some.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/noversion.dll"},
+    {"type": "pdb", "file": "usr/bin/noversion"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/noversion.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/onlyversion-1.dll"},
+    {"type": "pdb", "file": "usr/bin/onlyversion-1"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/onlyversion.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/onlysoversion-5.dll"},
+    {"type": "pdb", "file": "usr/bin/onlysoversion-5"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/onlysoversion.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/libexec/customdir.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/libexec/customdir.lib"},
+    {"type": "pdb", "file": "usr/libexec/customdir"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/modules/module.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/modules/module.lib"},
+    {"type": "pdb", "file": "usr/lib/modules/module"},
+    {"type": "expr", "platform": "gcc", "file": "usr/bin/?libsome-0.dll"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsome.dll.a"},
+    {"type": "expr", "platform": "gcc", "file": "usr/bin/?libnoversion.dll"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libnoversion.dll.a"},
+    {"type": "expr", "platform": "gcc", "file": "usr/bin/?libonlyversion-1.dll"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libonlyversion.dll.a"},
+    {"type": "expr", "platform": "gcc", "file": "usr/bin/?libonlysoversion-5.dll"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libonlysoversion.dll.a"},
+    {"type": "expr", "platform": "gcc", "file": "usr/libexec/?libcustomdir.dll"},
+    {"type": "file", "platform": "gcc", "file": "usr/libexec/libcustomdir.dll.a"},
+    {"type": "expr", "platform": "gcc", "file": "usr/lib/modules/?libmodule.dll"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/modules/libmodule.dll.a"}
+  ]
+}