aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-08-26 19:27:23 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2019-08-26 19:28:03 +0300
commit267a69b1c94ccee6da7ddecf5f7e1b59e7a50598 (patch)
tree47b327be36999c0e373ad37789629ce6c09c0541
parent0a4609031c6f7a9d988a5b7248add35caefc35da (diff)
downloadmeson-267a69b1c94ccee6da7ddecf5f7e1b59e7a50598.zip
meson-267a69b1c94ccee6da7ddecf5f7e1b59e7a50598.tar.gz
meson-267a69b1c94ccee6da7ddecf5f7e1b59e7a50598.tar.bz2
Fix packaging.
-rw-r--r--MANIFEST.in1
-rwxr-xr-xrun_unittests.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 53853d3..13f7949 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -18,3 +18,4 @@ include run_project_tests.py
include mesonrewriter.py
include ghwt.py
include __main__.py
+include meson.py
diff --git a/run_unittests.py b/run_unittests.py
index 2b2da7c..569bbea 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5297,6 +5297,8 @@ class LinuxCrossArmTests(BasePlatformTests):
@skipIfNoPkgconfig
def test_pkg_config_option(self):
+ if not shutil.which('arm-linux-gnueabihf-pkg-config'):
+ raise unittest.SkipTest('Cross-pkgconfig not found.')
testdir = os.path.join(self.unit_test_dir, '55 pkg_config_path option')
self.init(testdir, extra_args=[
'-Dbuild.pkg_config_path=' + os.path.join(testdir, 'build_extra_path'),