Merge pull request #1356 from centricular/cross-platform-unit-tests

Run unit tests on more platforms, and more

1 files changed, 6 insertions, 4 deletions

diff --git a/run_tests.py b/run_tests.py
index 005717e..f2038e4 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2012-2016 The Meson development team
+# Copyright 2012-2017 The Meson development team
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,10 +21,12 @@ from mesonbuild import mesonlib
 if __name__ == '__main__':
     returncode = 0
     print('Running unittests.\n')
+    units = ['InternalTests', 'AllPlatformTests']
     if mesonlib.is_linux():
-        returncode += subprocess.call([sys.executable, 'run_unittests.py', '-v'])
-    else:
-        returncode += subprocess.call([sys.executable, 'run_unittests.py', '-v', 'InternalTests'])
+        units += ['LinuxlikeTests']
+    elif mesonlib.is_windows():
+        units += ['WindowsTests']
+    returncode += subprocess.call([sys.executable, 'run_unittests.py', '-v'] + units)
     # Ubuntu packages do not have a binary without -6 suffix.
     if shutil.which('arm-linux-gnueabihf-gcc-6') and not platform.machine().startswith('arm'):
         print('Running cross compilation tests.\n')