diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-09-14 21:43:24 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-09-14 22:35:46 +0200 |
| commit | 0fc9a6018975c641d677f2827bbc58481dcd8d6c (patch) | |
| tree | 1522f96a64680f38d32426580adb600a829d4426 | |
| parent | 81e7a0981b7a815c8a85c731d7b2ca7676145130 (diff) | |
| download | meson-0fc9a6018975c641d677f2827bbc58481dcd8d6c.zip meson-0fc9a6018975c641d677f2827bbc58481dcd8d6c.tar.gz meson-0fc9a6018975c641d677f2827bbc58481dcd8d6c.tar.bz2 | |
run_proect_tests: add cygwin as platform fix name
| -rwxr-xr-x | run_project_tests.py | 7 | ||||
| -rw-r--r-- | test cases/frameworks/12 multiple gir/installed_files.txt | 4 | ||||
| -rw-r--r-- | test cases/vala/11 generated vapi/installed_files.txt | 4 | ||||
| -rw-r--r-- | test cases/vala/7 shared library/installed_files.txt | 4 | ||||
| -rw-r--r-- | test cases/vala/9 gir/installed_files.txt | 2 |
5 files changed, 13 insertions, 8 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 54b25a5..27e588b 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -155,7 +155,12 @@ def platform_fix_name(fname, compiler, env): if fname.startswith('?gcc:'): fname = fname[5:] - if compiler == 'cl' or fname.endswith('dll.a') and not mesonlib.for_cygwin(env.is_cross_build(), env): + if compiler == 'cl': + return None + + if fname.startswith('?cygwin:'): + fname = fname[8:] + if compiler == 'cl' or not mesonlib.for_cygwin(env.is_cross_build(), env): return None return fname diff --git a/test cases/frameworks/12 multiple gir/installed_files.txt b/test cases/frameworks/12 multiple gir/installed_files.txt index 9ebdf70..3f9a8f2 100644 --- a/test cases/frameworks/12 multiple gir/installed_files.txt +++ b/test cases/frameworks/12 multiple gir/installed_files.txt @@ -1,8 +1,8 @@ usr/lib/girepository-1.0/Meson-1.0.typelib usr/lib/girepository-1.0/MesonSub-1.0.typelib usr/lib/?libgirlib.so -?gcc:usr/lib/libgirlib.dll.a +?cygwin:usr/lib/libgirlib.dll.a usr/lib/?libgirsubproject.so -?gcc:usr/lib/libgirsubproject.dll.a +?cygwin:usr/lib/libgirsubproject.dll.a usr/share/gir-1.0/Meson-1.0.gir usr/share/gir-1.0/MesonSub-1.0.gir diff --git a/test cases/vala/11 generated vapi/installed_files.txt b/test cases/vala/11 generated vapi/installed_files.txt index b0d701f..ca41d65 100644 --- a/test cases/vala/11 generated vapi/installed_files.txt +++ b/test cases/vala/11 generated vapi/installed_files.txt @@ -1,8 +1,8 @@ usr/bin/vapigen-test?exe usr/lib/?libfoo.so -?gcc:usr/lib/libfoo.dll.a +?cygwin:usr/lib/libfoo.dll.a usr/lib/?libbar.so -?gcc:usr/lib/libbar.dll.a +?cygwin:usr/lib/libbar.dll.a usr/share/vala/vapi/foo-1.0.vapi usr/share/vala/vapi/foo-1.0.deps usr/share/vala/vapi/bar-1.0.vapi diff --git a/test cases/vala/7 shared library/installed_files.txt b/test cases/vala/7 shared library/installed_files.txt index 7d36c36..83cbb63 100644 --- a/test cases/vala/7 shared library/installed_files.txt +++ b/test cases/vala/7 shared library/installed_files.txt @@ -1,7 +1,7 @@ usr/lib/?libinstalled_vala_lib.so +?cygwin:usr/lib/libinstalled_vala_lib.dll.a usr/lib/?libinstalled_vala_all.so -?gcc:usr/lib/libinstalled_vala_all.dll.a -?gcc:usr/lib/libinstalled_vala_lib.dll.a +?cygwin:usr/lib/libinstalled_vala_all.dll.a usr/include/installed_vala_all.h usr/include/valah/installed_vala_all_nolib.h usr/include/installed_vala_onlyh.h diff --git a/test cases/vala/9 gir/installed_files.txt b/test cases/vala/9 gir/installed_files.txt index f7ee091..890b47a 100644 --- a/test cases/vala/9 gir/installed_files.txt +++ b/test cases/vala/9 gir/installed_files.txt @@ -1,3 +1,3 @@ ?gcc:usr/lib/?libfoo.so -?gcc:usr/lib/libfoo.dll.a +?cygwin:usr/lib/libfoo.dll.a usr/share/gir-1.0/Foo-1.0.gir |