From 87750bf98897f1fa590ed6e55b90936a72e1d2fe Mon Sep 17 00:00:00 2001 From: GoaLitiuM Date: Mon, 17 Sep 2018 09:58:16 +0300 Subject: Fix regressed D test cases on Windows --- test cases/d/3 shared library/meson.build | 18 ++++++++---------- test cases/d/5 mixed/installed_files.txt | 2 ++ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'test cases/d') 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 -- cgit v1.1