diff options
| -rwxr-xr-x | run_project_tests.py | 3 | ||||
| -rw-r--r-- | test cases/d/1 simple/test.json | 3 | ||||
| -rw-r--r-- | test cases/d/2 static library/test.json | 1 | ||||
| -rw-r--r-- | test cases/d/3 shared library/test.json | 2 | ||||
| -rw-r--r-- | test cases/d/4 library versions/test.json | 12 | ||||
| -rw-r--r-- | test cases/d/5 mixed/test.json | 2 | ||||
| -rw-r--r-- | test cases/d/6 unittest/test.json | 3 | ||||
| -rw-r--r-- | test cases/d/7 multilib/test.json | 7 |
8 files changed, 24 insertions, 9 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 160fbf3..16971f7 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -105,7 +105,8 @@ class InstalledFile: def get_path(self, compiler: str, env: environment.Environment) -> T.Optional[Path]: p = Path(self.path) 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' # Abort if the platform does not match diff --git a/test cases/d/1 simple/test.json b/test cases/d/1 simple/test.json index 7ec2783..ca64a36 100644 --- a/test cases/d/1 simple/test.json +++ b/test cases/d/1 simple/test.json @@ -1,5 +1,6 @@ { "installed": [ - {"type": "exe", "file": "usr/bin/dsimpleapp"} + {"type": "exe", "file": "usr/bin/dsimpleapp"}, + {"type": "pdb", "file": "usr/bin/dsimpleapp"} ] } diff --git a/test cases/d/2 static library/test.json b/test cases/d/2 static library/test.json index 50d5cdf..2296bd7 100644 --- a/test cases/d/2 static library/test.json +++ b/test cases/d/2 static library/test.json @@ -1,6 +1,7 @@ { "installed": [ {"type": "exe", "file": "usr/bin/app_s"}, + {"type": "pdb", "file": "usr/bin/app_s"}, {"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 742c576..c08833d 100644 --- a/test cases/d/3 shared library/test.json +++ b/test cases/d/3 shared library/test.json @@ -1,7 +1,9 @@ { "installed": [ {"type": "exe", "file": "usr/bin/app_d"}, + {"type": "pdb", "file": "usr/bin/app_d"}, {"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": "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 942122b..0956dca 100644 --- a/test cases/d/4 library versions/test.json +++ b/test cases/d/4 library versions/test.json @@ -10,12 +10,16 @@ {"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": "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": "pdb", "file": "usr/bin/onlyversion", "version": "1"}, {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/some", "version": "0"}, - {"type": "file", "platform": "msvc", "file": "usr/lib/noversion.lib"}, - {"type": "file", "platform": "msvc", "file": "usr/lib/onlysoversion.lib"}, - {"type": "file", "platform": "msvc", "file": "usr/lib/onlyversion.lib"}, - {"type": "file", "platform": "msvc", "file": "usr/lib/some.lib"} + {"type": "pdb", "file": "usr/bin/some", "version": "0"}, + {"type": "implib", "file": "usr/lib/noversion"}, + {"type": "implib", "file": "usr/lib/onlysoversion"}, + {"type": "implib", "file": "usr/lib/onlyversion"}, + {"type": "implib", "file": "usr/lib/some"} ] } diff --git a/test cases/d/5 mixed/test.json b/test cases/d/5 mixed/test.json index 77df4af..e2c6245 100644 --- a/test cases/d/5 mixed/test.json +++ b/test cases/d/5 mixed/test.json @@ -1,7 +1,9 @@ { "installed": [ {"type": "exe", "file": "usr/bin/appdc_d"}, + {"type": "pdb", "file": "usr/bin/appdc_d"}, {"type": "exe", "file": "usr/bin/appdc_s"}, + {"type": "pdb", "file": "usr/bin/appdc_s"}, {"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"}, diff --git a/test cases/d/6 unittest/test.json b/test cases/d/6 unittest/test.json index 433e4b0..88e94e9 100644 --- a/test cases/d/6 unittest/test.json +++ b/test cases/d/6 unittest/test.json @@ -1,5 +1,6 @@ { "installed": [ - {"type": "exe", "file": "usr/bin/dapp"} + {"type": "exe", "file": "usr/bin/dapp"}, + {"type": "pdb", "file": "usr/bin/dapp"} ] } diff --git a/test cases/d/7 multilib/test.json b/test cases/d/7 multilib/test.json index 2d51338..a9c5706 100644 --- a/test cases/d/7 multilib/test.json +++ b/test cases/d/7 multilib/test.json @@ -1,6 +1,7 @@ { "installed": [ {"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", "version": "0"}, {"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.2.4"}, {"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": "file", "platform": "msvc", "file": "usr/lib/say1.lib"}, - {"type": "file", "platform": "msvc", "file": "usr/lib/say2.lib"} + {"type": "pdb", "file": "usr/bin/say2", "version": "1"}, + {"type": "implib", "file": "usr/lib/say1"}, + {"type": "implib", "file": "usr/lib/say2"} ] } |