aboutsummaryrefslogtreecommitdiff
path: root/test cases/csharp
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-02-20 21:09:57 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2020-02-25 21:47:42 +0100
commit8e60b8c14610fe287df42a76a60148aae86b8284 (patch)
tree83e57cf2b54dd97c4de912ec310a836f03269d2e /test cases/csharp
parent3065202f6b02b0bfcbd84e0acc5090cdedeeedb4 (diff)
downloadmeson-8e60b8c14610fe287df42a76a60148aae86b8284.zip
meson-8e60b8c14610fe287df42a76a60148aae86b8284.tar.gz
meson-8e60b8c14610fe287df42a76a60148aae86b8284.tar.bz2
test: merge installed_files.txt into test.json
Diffstat (limited to 'test cases/csharp')
-rw-r--r--test cases/csharp/1 basic/installed_files.txt2
-rw-r--r--test cases/csharp/1 basic/test.json6
-rw-r--r--test cases/csharp/2 library/installed_files.txt5
-rw-r--r--test cases/csharp/2 library/test.json9
-rw-r--r--test cases/csharp/4 external dep/installed_files.txt1
-rw-r--r--test cases/csharp/4 external dep/test.json5
6 files changed, 20 insertions, 8 deletions
diff --git a/test cases/csharp/1 basic/installed_files.txt b/test cases/csharp/1 basic/installed_files.txt
deleted file mode 100644
index 5022d28..0000000
--- a/test cases/csharp/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/csharp/1 basic/test.json b/test cases/csharp/1 basic/test.json
new file mode 100644
index 0000000..650a6e2
--- /dev/null
+++ b/test cases/csharp/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/csharp/2 library/installed_files.txt b/test cases/csharp/2 library/installed_files.txt
deleted file mode 100644
index 73e77a2..0000000
--- a/test cases/csharp/2 library/installed_files.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/prog.exe
-?msvc:usr/bin/prog.pdb
-?msvc:usr/bin/helper.dll
-?msvc:usr/bin/helper.pdb
-?gcc:usr/lib/helper.dll
diff --git a/test cases/csharp/2 library/test.json b/test cases/csharp/2 library/test.json
new file mode 100644
index 0000000..0523f45
--- /dev/null
+++ b/test cases/csharp/2 library/test.json
@@ -0,0 +1,9 @@
+{
+ "installed": [
+ {"type": "file", "file": "usr/bin/prog.exe"},
+ {"type": "pdb", "file": "usr/bin/prog"},
+ {"type": "file", "platform": "msvc", "file": "usr/bin/helper.dll"},
+ {"type": "pdb", "file": "usr/bin/helper"},
+ {"type": "file", "platform": "gcc", "file": "usr/lib/helper.dll"}
+ ]
+}
diff --git a/test cases/csharp/4 external dep/installed_files.txt b/test cases/csharp/4 external dep/installed_files.txt
deleted file mode 100644
index f64c68c..0000000
--- a/test cases/csharp/4 external dep/installed_files.txt
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/prog.exe
diff --git a/test cases/csharp/4 external dep/test.json b/test cases/csharp/4 external dep/test.json
new file mode 100644
index 0000000..a94303f
--- /dev/null
+++ b/test cases/csharp/4 external dep/test.json
@@ -0,0 +1,5 @@
+{
+ "installed": [
+ {"type": "file", "file": "usr/bin/prog.exe"}
+ ]
+}