aboutsummaryrefslogtreecommitdiff
path: root/test cases/d
diff options
context:
space:
mode:
authorGoaLitiuM <goalitium@kapsi.fi>2018-09-17 09:58:16 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2018-09-17 21:28:16 +0300
commit87750bf98897f1fa590ed6e55b90936a72e1d2fe (patch)
tree01d158d54e42d41f019fb3d0880c803597dbc198 /test cases/d
parent32111746ba8f7b870a326d4f069b6a235c082f05 (diff)
downloadmeson-87750bf98897f1fa590ed6e55b90936a72e1d2fe.zip
meson-87750bf98897f1fa590ed6e55b90936a72e1d2fe.tar.gz
meson-87750bf98897f1fa590ed6e55b90936a72e1d2fe.tar.bz2
Fix regressed D test cases on Windows
Diffstat (limited to 'test cases/d')
-rw-r--r--test cases/d/3 shared library/meson.build18
-rw-r--r--test cases/d/5 mixed/installed_files.txt2
2 files changed, 10 insertions, 10 deletions
diff --git a/test cases/d/3 shared library/meson.build b/test cases/d/3 shared library/meson.build
index 64f972b..b37b700 100644
--- a/test cases/d/3 shared library/meson.build
+++ b/test cases/d/3 shared library/meson.build
@@ -11,13 +11,11 @@ ldyn = shared_library('stuff', 'libstuff.d', install : true)
ed = executable('app_d', 'app.d', link_with : ldyn, install : true)
test('linktest_dyn', ed)
-if host_machine.system() != 'windows'
- # test D attributes for pkg-config
- pkgc = import('pkgconfig')
- pkgc.generate(name: 'test',
- libraries: ldyn,
- subdirs: 'd/stuff',
- description: 'A test of D attributes to pkgconfig.generate.',
- d_module_versions: ['Use_Static']
- )
-endif
+# test D attributes for pkg-config
+pkgc = import('pkgconfig')
+pkgc.generate(name: 'test',
+ libraries: ldyn,
+ subdirs: 'd/stuff',
+ description: 'A test of D attributes to pkgconfig.generate.',
+ d_module_versions: ['Use_Static']
+)
diff --git a/test cases/d/5 mixed/installed_files.txt b/test cases/d/5 mixed/installed_files.txt
index 5f3f4e2..5950753 100644
--- a/test cases/d/5 mixed/installed_files.txt
+++ b/test cases/d/5 mixed/installed_files.txt
@@ -3,4 +3,6 @@ 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
+?msvc:usr/lib/stuff.pdb