diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-26 15:27:37 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-05 10:50:22 +0000 |
commit | 21dc45dbbb567068ae2dafc9e34fba24e04e0d93 (patch) | |
tree | ef19074c1d15e1b1f9ca3ef213991ab4337a1b60 /run_tests.py | |
parent | efa9b75d5d21018b27f593ee65ea562d10d6dc2c (diff) | |
download | meson-21dc45dbbb567068ae2dafc9e34fba24e04e0d93.zip meson-21dc45dbbb567068ae2dafc9e34fba24e04e0d93.tar.gz meson-21dc45dbbb567068ae2dafc9e34fba24e04e0d93.tar.bz2 |
Add MinGW-w64 64-bit to the Travis CI
Includes new cross files for MinGW-w64
Diffstat (limited to 'run_tests.py')
-rwxr-xr-x | run_tests.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/run_tests.py b/run_tests.py index 736cdc0..da02a9b 100755 --- a/run_tests.py +++ b/run_tests.py @@ -158,6 +158,9 @@ def get_fake_options(prefix): def should_run_linux_cross_tests(): return shutil.which('arm-linux-gnueabihf-gcc') and not platform.machine().lower().startswith('arm') +def should_run_mingw_cross_tests(): + return shutil.which('x86_64-w64-mingw32-gcc') + def run_configure_inprocess(commandlist): old_stdout = sys.stdout sys.stdout = mystdout = StringIO() @@ -244,11 +247,15 @@ if __name__ == '__main__': # Unit tests returncode += subprocess.call(mesonlib.python_command + ['run_unittests.py', '-v'], env=env) # Ubuntu packages do not have a binary without -6 suffix. + cross_test_args = mesonlib.python_command + ['run_cross_test.py'] if should_run_linux_cross_tests(): - print(mlog.bold('Running cross compilation tests.').get_text(mlog.colorize_console)) + print(mlog.bold('Running armhf cross tests.').get_text(mlog.colorize_console)) + print() + returncode += subprocess.call(cross_test_args + ['cross/ubuntu-armhf.txt'], env=env) + if should_run_mingw_cross_tests(): + print(mlog.bold('Running mingw-w64 64-bit cross tests.').get_text(mlog.colorize_console)) print() - returncode += subprocess.call(mesonlib.python_command + ['run_cross_test.py', 'cross/ubuntu-armhf.txt'], - env=env) + returncode += subprocess.call(cross_test_args + ['cross/linux-mingw-w64-64bit.txt'], env=env) # Project tests returncode += subprocess.call(mesonlib.python_command + ['run_project_tests.py'] + sys.argv[1:], env=env) sys.exit(returncode) |