test: merge installed_files.txt into test.json

14 files changed, 72 insertions, 44 deletions

diff --git a/test cases/d/1 simple/installed_files.txt b/test cases/d/1 simple/installed_files.txt
deleted file mode 100644
index 9374c54..0000000
--- a/test cases/d/1 simple/installed_files.txt
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/dsimpleapp?exe
diff --git a/test cases/d/1 simple/test.json b/test cases/d/1 simple/test.json
new file mode 100644
index 0000000..7ec2783
--- /dev/null
+++ b/test cases/d/1 simple/test.json
@@ -0,0 +1,5 @@
+{
+  "installed": [
+    {"type": "exe", "file": "usr/bin/dsimpleapp"}
+  ]
+}
diff --git a/test cases/d/2 static library/installed_files.txt b/test cases/d/2 static library/installed_files.txt
deleted file mode 100644
index 0f2bab4..0000000
--- a/test cases/d/2 static library/installed_files.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/app_s?exe
-usr/lib/libstuff.a
diff --git a/test cases/d/2 static library/test.json b/test cases/d/2 static library/test.json
new file mode 100644
index 0000000..50d5cdf
--- /dev/null
+++ b/test cases/d/2 static library/test.json
@@ -0,0 +1,6 @@
+{
+  "installed": [
+    {"type": "exe", "file": "usr/bin/app_s"},
+    {"type": "file", "file": "usr/lib/libstuff.a"}
+  ]
+}
diff --git a/test cases/d/3 shared library/installed_files.txt b/test cases/d/3 shared library/installed_files.txt
deleted file mode 100644
index 4e2c591..0000000
--- a/test cases/d/3 shared library/installed_files.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/app_d?exe
-?msvc:usr/bin/stuff.dll
-?msvc:usr/lib/stuff.lib
-?gcc:usr/lib/libstuff.so
-usr/lib/pkgconfig/test.pc
diff --git a/test cases/d/3 shared library/test.json b/test cases/d/3 shared library/test.json
new file mode 100644
index 0000000..66c546b
--- /dev/null
+++ b/test cases/d/3 shared library/test.json
@@ -0,0 +1,9 @@
+{
+  "installed": [
+    {"type": "exe", "file": "usr/bin/app_d"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/stuff.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/stuff.lib"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff.so"},
+    {"type": "file", "file": "usr/lib/pkgconfig/test.pc"}
+  ]
+}
diff --git a/test cases/d/4 library versions/installed_files.txt b/test cases/d/4 library versions/installed_files.txt
deleted file mode 100644
index 2cf8d4b..0000000
--- a/test cases/d/4 library versions/installed_files.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-?gcc:usr/lib/libsome.so
-?gcc:usr/lib/libsome.so.0
-?gcc:usr/lib/libsome.so.1.2.3
-?gcc:usr/lib/libnoversion.so
-?gcc:usr/lib/libonlyversion.so
-?gcc:usr/lib/libonlyversion.so.1
-?gcc:usr/lib/libonlyversion.so.1.4.5
-?gcc:usr/lib/libonlysoversion.so
-?gcc:usr/lib/libonlysoversion.so.5
-?msvc:usr/bin/noversion.dll
-?msvc:usr/bin/onlysoversion-5.dll
-?msvc:usr/bin/onlyversion-1.dll
-?msvc:usr/bin/some-0.dll
-?msvc:usr/lib/noversion.lib
-?msvc:usr/lib/onlysoversion.lib
-?msvc:usr/lib/onlyversion.lib
-?msvc:usr/lib/some.lib
diff --git a/test cases/d/4 library versions/test.json b/test cases/d/4 library versions/test.json
new file mode 100644
index 0000000..2a3433e
--- /dev/null
+++ b/test cases/d/4 library versions/test.json
@@ -0,0 +1,21 @@
+{
+  "installed": [
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsome.so"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsome.so.0"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsome.so.1.2.3"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libnoversion.so"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libonlyversion.so"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libonlyversion.so.1"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libonlyversion.so.1.4.5"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libonlysoversion.so"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libonlysoversion.so.5"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/noversion.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/onlysoversion-5.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/onlyversion-1.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/some-0.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/noversion.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/onlysoversion.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/onlyversion.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/some.lib"}
+  ]
+}
diff --git a/test cases/d/5 mixed/installed_files.txt b/test cases/d/5 mixed/installed_files.txt
deleted file mode 100644
index 46b7721..0000000
--- a/test cases/d/5 mixed/installed_files.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/appdc_d?exe
-usr/bin/appdc_s?exe
-usr/lib/libstuff.a
-?gcc:usr/lib/libstuff.so
-?msvc:usr/bin/stuff.dll
-?msvc:usr/bin/stuff.pdb
-?msvc:usr/lib/stuff.lib
diff --git a/test cases/d/5 mixed/test.json b/test cases/d/5 mixed/test.json
new file mode 100644
index 0000000..a63a19b
--- /dev/null
+++ b/test cases/d/5 mixed/test.json
@@ -0,0 +1,11 @@
+{
+  "installed": [
+    {"type": "exe", "file": "usr/bin/appdc_d"},
+    {"type": "exe", "file": "usr/bin/appdc_s"},
+    {"type": "file", "file": "usr/lib/libstuff.a"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff.so"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/stuff.dll"},
+    {"type": "pdb", "file": "usr/bin/stuff"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/stuff.lib"}
+  ]
+}
diff --git a/test cases/d/6 unittest/installed_files.txt b/test cases/d/6 unittest/installed_files.txt
deleted file mode 100644
index e718389..0000000
--- a/test cases/d/6 unittest/installed_files.txt
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/dapp?exe
diff --git a/test cases/d/6 unittest/test.json b/test cases/d/6 unittest/test.json
new file mode 100644
index 0000000..433e4b0
--- /dev/null
+++ b/test cases/d/6 unittest/test.json
@@ -0,0 +1,5 @@
+{
+  "installed": [
+    {"type": "exe", "file": "usr/bin/dapp"}
+  ]
+}
diff --git a/test cases/d/7 multilib/installed_files.txt b/test cases/d/7 multilib/installed_files.txt
deleted file mode 100644
index 473479f..0000000
--- a/test cases/d/7 multilib/installed_files.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/bin/app_d?exe
-?gcc:usr/lib/libsay1.so
-?gcc:usr/lib/libsay1.so.0
-?gcc:usr/lib/libsay1.so.1.2.3
-?gcc:usr/lib/libsay2.so
-?gcc:usr/lib/libsay2.so.1
-?gcc:usr/lib/libsay2.so.1.2.4
-?msvc:usr/bin/say1-0.dll
-?msvc:usr/bin/say2-1.dll
-?msvc:usr/lib/say1.lib
-?msvc:usr/lib/say2.lib
diff --git a/test cases/d/7 multilib/test.json b/test cases/d/7 multilib/test.json
new file mode 100644
index 0000000..408c4f2
--- /dev/null
+++ b/test cases/d/7 multilib/test.json
@@ -0,0 +1,15 @@
+{
+  "installed": [
+    {"type": "exe", "file": "usr/bin/app_d"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsay1.so"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsay1.so.0"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsay1.so.1.2.3"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsay2.so"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsay2.so.1"},
+    {"type": "file", "platform": "gcc", "file": "usr/lib/libsay2.so.1.2.4"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/say1-0.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/bin/say2-1.dll"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/say1.lib"},
+    {"type": "file", "platform": "msvc", "file": "usr/lib/say2.lib"}
+  ]
+}