tests: Add pdb files for d tests

pull/6356/head
Dylan Baker 5 years ago
parent fe86c594c6
commit c9ecfc84ff
  1. 3
      run_project_tests.py
  2. 3
      test cases/d/1 simple/test.json
  3. 1
      test cases/d/2 static library/test.json
  4. 2
      test cases/d/3 shared library/test.json
  5. 12
      test cases/d/4 library versions/test.json
  6. 2
      test cases/d/5 mixed/test.json
  7. 3
      test cases/d/6 unittest/test.json
  8. 7
      test cases/d/7 multilib/test.json

@ -105,7 +105,8 @@ class InstalledFile:
def get_path(self, compiler: str, env: environment.Environment) -> T.Optional[Path]: def get_path(self, compiler: str, env: environment.Environment) -> T.Optional[Path]:
p = Path(self.path) p = Path(self.path)
canonical_compiler = compiler canonical_compiler = compiler
if (compiler in ['clang-cl', 'intel-cl']) or (env.machines.host.is_windows() and compiler == 'pgi'): if ((compiler in ['clang-cl', 'intel-cl']) or
(env.machines.host.is_windows() and compiler in {'pgi', 'dmd', 'ldc'})):
canonical_compiler = 'msvc' canonical_compiler = 'msvc'
# Abort if the platform does not match # Abort if the platform does not match

@ -1,5 +1,6 @@
{ {
"installed": [ "installed": [
{"type": "exe", "file": "usr/bin/dsimpleapp"} {"type": "exe", "file": "usr/bin/dsimpleapp"},
{"type": "pdb", "file": "usr/bin/dsimpleapp"}
] ]
} }

@ -1,6 +1,7 @@
{ {
"installed": [ "installed": [
{"type": "exe", "file": "usr/bin/app_s"}, {"type": "exe", "file": "usr/bin/app_s"},
{"type": "pdb", "file": "usr/bin/app_s"},
{"type": "file", "file": "usr/lib/libstuff.a"} {"type": "file", "file": "usr/lib/libstuff.a"}
] ]
} }

@ -1,7 +1,9 @@
{ {
"installed": [ "installed": [
{"type": "exe", "file": "usr/bin/app_d"}, {"type": "exe", "file": "usr/bin/app_d"},
{"type": "pdb", "file": "usr/bin/app_d"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/stuff"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/stuff"},
{"type": "pdb", "file": "usr/bin/stuff"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff"}, {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff"},
{"type": "file", "platform": "msvc", "file": "usr/lib/stuff.lib"}, {"type": "file", "platform": "msvc", "file": "usr/lib/stuff.lib"},
{"type": "file", "file": "usr/lib/pkgconfig/test.pc"} {"type": "file", "file": "usr/lib/pkgconfig/test.pc"}

@ -10,12 +10,16 @@
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlysoversion"}, {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlysoversion"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlysoversion", "version": "5"}, {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlysoversion", "version": "5"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/noversion"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/noversion"},
{"type": "pdb", "file": "usr/bin/noversion"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/onlysoversion", "version": "5"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/onlysoversion", "version": "5"},
{"type": "pdb", "file": "usr/bin/onlysoversion", "version": "5"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/onlyversion", "version": "1"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/onlyversion", "version": "1"},
{"type": "pdb", "file": "usr/bin/onlyversion", "version": "1"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/some", "version": "0"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/some", "version": "0"},
{"type": "file", "platform": "msvc", "file": "usr/lib/noversion.lib"}, {"type": "pdb", "file": "usr/bin/some", "version": "0"},
{"type": "file", "platform": "msvc", "file": "usr/lib/onlysoversion.lib"}, {"type": "implib", "file": "usr/lib/noversion"},
{"type": "file", "platform": "msvc", "file": "usr/lib/onlyversion.lib"}, {"type": "implib", "file": "usr/lib/onlysoversion"},
{"type": "file", "platform": "msvc", "file": "usr/lib/some.lib"} {"type": "implib", "file": "usr/lib/onlyversion"},
{"type": "implib", "file": "usr/lib/some"}
] ]
} }

@ -1,7 +1,9 @@
{ {
"installed": [ "installed": [
{"type": "exe", "file": "usr/bin/appdc_d"}, {"type": "exe", "file": "usr/bin/appdc_d"},
{"type": "pdb", "file": "usr/bin/appdc_d"},
{"type": "exe", "file": "usr/bin/appdc_s"}, {"type": "exe", "file": "usr/bin/appdc_s"},
{"type": "pdb", "file": "usr/bin/appdc_s"},
{"type": "file", "file": "usr/lib/libstuff.a"}, {"type": "file", "file": "usr/lib/libstuff.a"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff"}, {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/stuff"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/stuff"},

@ -1,5 +1,6 @@
{ {
"installed": [ "installed": [
{"type": "exe", "file": "usr/bin/dapp"} {"type": "exe", "file": "usr/bin/dapp"},
{"type": "pdb", "file": "usr/bin/dapp"}
] ]
} }

@ -1,6 +1,7 @@
{ {
"installed": [ "installed": [
{"type": "exe", "file": "usr/bin/app_d"}, {"type": "exe", "file": "usr/bin/app_d"},
{"type": "pdb", "file": "usr/bin/app_d"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1"}, {"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": "0"},
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1", "version": "1.2.3"}, {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1", "version": "1.2.3"},
@ -8,8 +9,10 @@
{"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say2", "version": "1"}, {"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": "gcc", "file": "usr/lib/say2", "version": "1.2.4"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/say1", "version": "0"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/say1", "version": "0"},
{"type": "pdb", "file": "usr/bin/say1", "version": "0"},
{"type": "shared_lib", "platform": "msvc", "file": "usr/bin/say2", "version": "1"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/say2", "version": "1"},
{"type": "file", "platform": "msvc", "file": "usr/lib/say1.lib"}, {"type": "pdb", "file": "usr/bin/say2", "version": "1"},
{"type": "file", "platform": "msvc", "file": "usr/lib/say2.lib"} {"type": "implib", "file": "usr/lib/say1"},
{"type": "implib", "file": "usr/lib/say2"}
] ]
} }

Loading…
Cancel
Save