diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-11-05 00:29:39 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-11-05 00:29:39 +0200 |
commit | 337b14e6029d9a68398b5170ebd992f59e5aeeb0 (patch) | |
tree | 7f2077165186a787a25e86a3b469e8b0eb9f47b8 | |
parent | bcdb84fcbe31b9dff686794b1cabaff0e95a5e91 (diff) | |
download | meson-337b14e6029d9a68398b5170ebd992f59e5aeeb0.zip meson-337b14e6029d9a68398b5170ebd992f59e5aeeb0.tar.gz meson-337b14e6029d9a68398b5170ebd992f59e5aeeb0.tar.bz2 |
Some test tuning.
-rw-r--r-- | build.py | 2 | ||||
-rw-r--r-- | environment.py | 3 | ||||
-rwxr-xr-x | run_tests.py | 11 |
3 files changed, 15 insertions, 1 deletions
@@ -419,7 +419,7 @@ class SharedLibrary(BuildTarget): def __init__(self, name, subdir, is_cross, sources, objects, environment, kwargs): self.version = None self.soversion = None - super().__init__(name, subdir, is_cross, sources, environment, kwargs); + super().__init__(name, subdir, is_cross, sources, objects, environment, kwargs); self.prefix = environment.get_shared_lib_prefix() self.suffix = environment.get_shared_lib_suffix() diff --git a/environment.py b/environment.py index cbf9352..84768f1 100644 --- a/environment.py +++ b/environment.py @@ -733,6 +733,9 @@ def find_cppcheck(): def is_osx(): return platform.system().lower() == 'darwin' +def is_linux(): + return platform.system().lower() == 'linux' + def is_windows(): return platform.system().lower() == 'windows' diff --git a/run_tests.py b/run_tests.py index ed75c52..7114c88 100755 --- a/run_tests.py +++ b/run_tests.py @@ -107,6 +107,12 @@ def gather_tests(testdir): def run_tests(): commontests = gather_tests('test cases/common') failtests = gather_tests('test cases/failing') + objtests = gather_tests('test cases/prebuilt object') + if environment.is_linux(): + cpuid = platform.machine() + if cpuid != 'x86_64' and cpuid != 'i386': + # Don't have a prebuilt object file for those so skip. + objtests = [] if environment.is_osx(): platformtests = gather_tests('test cases/osx') elif environment.is_windows(): @@ -133,6 +139,11 @@ def run_tests(): [run_test(t) for t in commontests] print('\nRunning failing tests.\n') [run_test(t, False) for t in failtests] + if len(objtests) > 0: + print('\nRunning object inclusion tests.\n') + [run_test(t) for t in objtests] + else: + print('\nNo object inclusion tests.\n') if len(platformtests) > 0: print('\nRunning platform dependent tests.\n') [run_test(t) for t in platformtests] |