aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2020-01-07 00:48:46 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2020-01-07 00:52:49 +0300
commit7c661741d906e0981bacc275e76963894aaa2997 (patch)
treebc7349d2c7425373a7823de1b86d994d18c6c1b6
parentTravis: add some tests for boost/build (diff)
downloadcmake-common-7c661741d906e0981bacc275e76963894aaa2997.tar.gz
cmake-common-7c661741d906e0981bacc275e76963894aaa2997.zip
boost/build/ci: fix module import errors
-rw-r--r--.travis.yml2
-rwxr-xr-xboost/build/ci/travis.py9
2 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 81c98e5..e601e25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,3 +15,5 @@ script:
- ./boost/build/build.py build --configuration Debug --platform x86 -- ./boost_1_58_0 --with-filesystem
- ./boost/build/build.py download --cache . 1.71.0
- ./boost/build/build.py build --configuration Release --platform x64 -- ./boost_1_71_0 link=static --with-filesystem
+
+ - travis_boost_version=1.71.0 configuration=Release platform=x64 ./boost/build/ci/travis.py -- --with-filesystem
diff --git a/boost/build/ci/travis.py b/boost/build/ci/travis.py
index 7f791e4..d5d00eb 100755
--- a/boost/build/ci/travis.py
+++ b/boost/build/ci/travis.py
@@ -14,8 +14,6 @@ import logging
import os
import sys
-from build import BoostVersion, main as build_main
-
def _env(name):
if name not in os.environ:
@@ -65,10 +63,15 @@ def build_travis(argv=None):
args = _parse_args(argv)
_check_travis()
+ this_module_dir = os.path.dirname(os.path.abspath(__file__))
+ parent_module_dir = os.path.dirname(this_module_dir)
+ sys.path.insert(1, parent_module_dir)
+ from build import BoostVersion, main as build_main
+
version = BoostVersion.from_string(_get_boost_version())
travis_argv = [
'download',
- '--build', _get_build_dir(),
+ '--unpack', _get_build_dir(),
'--', str(version)
]
build_main(travis_argv)