diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-29 22:51:29 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-31 14:04:58 +0200 |
commit | 92f8e0ab3162d33276f3ec057c1aa0ff17113052 (patch) | |
tree | 4699fec9dc35e3826771b79e4d45c54bd10f5df4 /run_tests.py | |
parent | 0a14ad63deb15f08f5186d0c2cd063e749722e4a (diff) | |
download | meson-92f8e0ab3162d33276f3ec057c1aa0ff17113052.zip meson-92f8e0ab3162d33276f3ec057c1aa0ff17113052.tar.gz meson-92f8e0ab3162d33276f3ec057c1aa0ff17113052.tar.bz2 |
Do not run arm cross compilation tests on arm.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-x | run_tests.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/run_tests.py b/run_tests.py index 5ba41bd..2dfbaff 100755 --- a/run_tests.py +++ b/run_tests.py @@ -15,6 +15,7 @@ # limitations under the License. import subprocess, sys, shutil +import platform from mesonbuild import mesonlib if __name__ == '__main__': @@ -22,7 +23,8 @@ if __name__ == '__main__': if mesonlib.is_linux(): print('Running unittests.\n') returncode += subprocess.call([sys.executable, 'run_unittests.py', '-v']) - if shutil.which('arm-linux-gnueabihf-gcc-6'): # Ubuntu packages do not have a binary without -6 suffix. + # 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') returncode += subprocess.call([sys.executable, 'run_cross_test.py', 'cross/ubuntu-armhf.txt']) returncode += subprocess.call([sys.executable, 'run_project_tests.py'] + sys.argv[1:]) |