summaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-03-09 16:53:26 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-03-09 16:55:08 -0700
commit747061795393a1f4e8ac7d9f3d297b733a34230b (patch)
treee0c84afcb849312bbcbf6fec8d19b18cd72cb09f /test cases
parentfc8fffaf47a7cddeaae16a368f54e4aa87a4f4b5 (diff)
downloadmeson-747061795393a1f4e8ac7d9f3d297b733a34230b.tar.gz
project_tests: Add the option to the test format to mark the language
This is needed when mixing D and C code, as it's possible to end up witha combination of linkers and compilres such that C produces pdb files but D does not.
Diffstat (limited to 'test cases')
-rw-r--r--test cases/d/1 simple/test.json2
-rw-r--r--test cases/d/2 static library/test.json2
-rw-r--r--test cases/d/3 shared library/test.json4
-rw-r--r--test cases/d/4 library versions/test.json8
-rw-r--r--test cases/d/5 mixed/test.json6
-rw-r--r--test cases/d/6 unittest/test.json2
-rw-r--r--test cases/d/7 multilib/test.json6
7 files changed, 15 insertions, 15 deletions
diff --git a/test cases/d/1 simple/test.json b/test cases/d/1 simple/test.json
index ca64a36a4..62f907a4c 100644
--- a/test cases/d/1 simple/test.json
+++ b/test cases/d/1 simple/test.json
@@ -1,6 +1,6 @@
{
"installed": [
{"type": "exe", "file": "usr/bin/dsimpleapp"},
- {"type": "pdb", "file": "usr/bin/dsimpleapp"}
+ {"type": "pdb", "file": "usr/bin/dsimpleapp", "language": "d"}
]
}
diff --git a/test cases/d/2 static library/test.json b/test cases/d/2 static library/test.json
index 2296bd711..6abb93409 100644
--- a/test cases/d/2 static library/test.json
+++ b/test cases/d/2 static library/test.json
@@ -1,7 +1,7 @@
{
"installed": [
{"type": "exe", "file": "usr/bin/app_s"},
- {"type": "pdb", "file": "usr/bin/app_s"},
+ {"type": "pdb", "file": "usr/bin/app_s", "language": "d"},
{"type": "file", "file": "usr/lib/libstuff.a"}
]
}
diff --git a/test cases/d/3 shared library/test.json b/test cases/d/3 shared library/test.json
index c08833d4a..50eb9cbdd 100644
--- a/test cases/d/3 shared library/test.json
+++ b/test cases/d/3 shared library/test.json
@@ -1,9 +1,9 @@
{
"installed": [
{"type": "exe", "file": "usr/bin/app_d"},
- {"type": "pdb", "file": "usr/bin/app_d"},
+ {"type": "pdb", "file": "usr/bin/app_d", "language": "d"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/stuff"},
- {"type": "pdb", "file": "usr/bin/stuff"},
+ {"type": "pdb", "file": "usr/bin/stuff", "language": "d"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff"},
{"type": "file", "platform": "msvc", "file": "usr/lib/stuff.lib"},
{"type": "file", "file": "usr/lib/pkgconfig/test.pc"}
diff --git a/test cases/d/4 library versions/test.json b/test cases/d/4 library versions/test.json
index 0956dca94..23c95dd52 100644
--- a/test cases/d/4 library versions/test.json
+++ b/test cases/d/4 library versions/test.json
@@ -10,13 +10,13 @@
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlysoversion"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlysoversion", "version": "5"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/noversion"},
- {"type": "pdb", "file": "usr/bin/noversion"},
+ {"type": "pdb", "file": "usr/bin/noversion", "language": "d"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/onlysoversion", "version": "5"},
- {"type": "pdb", "file": "usr/bin/onlysoversion", "version": "5"},
+ {"type": "pdb", "file": "usr/bin/onlysoversion", "version": "5", "language": "d"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/onlyversion", "version": "1"},
- {"type": "pdb", "file": "usr/bin/onlyversion", "version": "1"},
+ {"type": "pdb", "file": "usr/bin/onlyversion", "version": "1", "language": "d"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/some", "version": "0"},
- {"type": "pdb", "file": "usr/bin/some", "version": "0"},
+ {"type": "pdb", "file": "usr/bin/some", "version": "0", "language": "d"},
{"type": "implib", "file": "usr/lib/noversion"},
{"type": "implib", "file": "usr/lib/onlysoversion"},
{"type": "implib", "file": "usr/lib/onlyversion"},
diff --git a/test cases/d/5 mixed/test.json b/test cases/d/5 mixed/test.json
index e2c62451b..c95d0ca0c 100644
--- a/test cases/d/5 mixed/test.json
+++ b/test cases/d/5 mixed/test.json
@@ -1,13 +1,13 @@
{
"installed": [
{"type": "exe", "file": "usr/bin/appdc_d"},
- {"type": "pdb", "file": "usr/bin/appdc_d"},
+ {"type": "pdb", "file": "usr/bin/appdc_d", "language": "d"},
{"type": "exe", "file": "usr/bin/appdc_s"},
- {"type": "pdb", "file": "usr/bin/appdc_s"},
+ {"type": "pdb", "file": "usr/bin/appdc_s", "language": "d"},
{"type": "file", "file": "usr/lib/libstuff.a"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/stuff"},
- {"type": "pdb", "file": "usr/bin/stuff"},
+ {"type": "pdb", "file": "usr/bin/stuff", "language": "c"},
{"type": "file", "platform": "msvc", "file": "usr/lib/stuff.lib"}
]
}
diff --git a/test cases/d/6 unittest/test.json b/test cases/d/6 unittest/test.json
index 88e94e942..adc4d75a1 100644
--- a/test cases/d/6 unittest/test.json
+++ b/test cases/d/6 unittest/test.json
@@ -1,6 +1,6 @@
{
"installed": [
{"type": "exe", "file": "usr/bin/dapp"},
- {"type": "pdb", "file": "usr/bin/dapp"}
+ {"type": "pdb", "file": "usr/bin/dapp", "language": "d"}
]
}
diff --git a/test cases/d/7 multilib/test.json b/test cases/d/7 multilib/test.json
index a9c570696..5944ae0e1 100644
--- a/test cases/d/7 multilib/test.json
+++ b/test cases/d/7 multilib/test.json
@@ -1,7 +1,7 @@
{
"installed": [
{"type": "exe", "file": "usr/bin/app_d"},
- {"type": "pdb", "file": "usr/bin/app_d"},
+ {"type": "pdb", "file": "usr/bin/app_d", "language": "d"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1", "version": "0"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1", "version": "1.2.3"},
@@ -9,9 +9,9 @@
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say2", "version": "1"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say2", "version": "1.2.4"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/say1", "version": "0"},
- {"type": "pdb", "file": "usr/bin/say1", "version": "0"},
+ {"type": "pdb", "file": "usr/bin/say1", "version": "0", "language": "d"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/say2", "version": "1"},
- {"type": "pdb", "file": "usr/bin/say2", "version": "1"},
+ {"type": "pdb", "file": "usr/bin/say2", "version": "1", "language": "d"},
{"type": "implib", "file": "usr/lib/say1"},
{"type": "implib", "file": "usr/lib/say2"}
]