aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-03-25 23:15:16 +0300
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-03-25 23:15:23 +0300
commit2c8c6fbf2001ab3e4e95318d6e245a927fb79795 (patch)
tree7c0d109f93ccddf7ce0c14ebab15bbc1698569ff
parente0ba9ba2b9c9433d35bfde8695c43a46a1a0c23b (diff)
downloadmeson-2c8c6fbf2001ab3e4e95318d6e245a927fb79795.zip
meson-2c8c6fbf2001ab3e4e95318d6e245a927fb79795.tar.gz
meson-2c8c6fbf2001ab3e4e95318d6e245a927fb79795.tar.bz2
tests: add all platform tests and skip needed tests
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rwxr-xr-xrun_tests.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/run_tests.py b/run_tests.py
index fb85f51..60cd094 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -201,12 +201,9 @@ def detect_tests_to_run():
all_tests.append(('failing', gather_tests('test cases/failing'), False))
all_tests.append(('prebuilt object', gather_tests('test cases/prebuilt object'), False))
- if mesonlib.is_osx():
- all_tests.append(('platform', gather_tests('test cases/osx'), False))
- elif mesonlib.is_windows():
- all_tests.append(('platform', gather_tests('test cases/windows'), False))
- else:
- all_tests.append(('platform', gather_tests('test cases/linuxlike'), False))
+ all_tests.append(('platform-osx', gather_tests('test cases/osx'), False if mesonlib.is_osx() else True))
+ all_tests.append(('platform-windows', gather_tests('test cases/windows'), False if mesonlib.is_windows() else True))
+ all_tests.append(('platform-linux', gather_tests('test cases/linuxlike'), False if not (mesonlib.is_osx() or mesonlib.is_windows()) else True))
all_tests.append(('framework', gather_tests('test cases/frameworks'), False if not mesonlib.is_osx() and not mesonlib.is_windows() else True))
all_tests.append(('java', gather_tests('test cases/java'), False if not mesonlib.is_osx() and shutil.which('javac') else True))
all_tests.append(('C#', gather_tests('test cases/csharp'), False if shutil.which('mcs') else True))