diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-11-03 20:07:14 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-11-11 23:06:49 +0530 |
| commit | d32c6729901a8da6b30c7dced565697b378677dc (patch) | |
| tree | 81764919cbfb0049250da613d1691ad60314bcd7 /run_unittests.py | |
| parent | e0b56942a0e0b28730e56347b1d2f6cc03fb96d2 (diff) | |
| download | meson-d32c6729901a8da6b30c7dced565697b378677dc.zip meson-d32c6729901a8da6b30c7dced565697b378677dc.tar.gz meson-d32c6729901a8da6b30c7dced565697b378677dc.tar.bz2 | |
unit tests: Attempt to fix failure on Cygwin
This was always broken, but was missed because we ran MSVC on Cygwin
instead.
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/run_unittests.py b/run_unittests.py index 0ed365f..46056ad 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1431,6 +1431,8 @@ int main(int argc, char **argv) { impfile = os.path.join(tdir, 'alexandria.lib') if cc.id == 'msvc': shlibfile = os.path.join(tdir, 'alexandria.' + shared_suffix) + elif is_cygwin(): + shlibfile = os.path.join(tdir, 'cygalexandria.' + shared_suffix) else: shlibfile = os.path.join(tdir, 'libalexandria.' + shared_suffix) self.build_shared_lib(cc, source, objectfile, shlibfile, impfile) @@ -1464,6 +1466,8 @@ int main(int argc, char **argv) { impfile = os.path.join(testdir, 'foo.lib') if cc.id == 'msvc': shlibfile = os.path.join(testdir, 'foo.' + shext) + elif is_cygwin(): + shlibfile = os.path.join(testdir, 'cygfoo.' + shext) else: shlibfile = os.path.join(testdir, 'libfoo.' + shext) # Build libs |