boostorg/predef
1
0
Fork 1
mirror of https://github.com/boostorg/predef.git synced 2025-07-29 03:27:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make the lib test generic to main or PRs.

Browse Source
This commit is contained in:
Rene Rivera
2018-05-14 22:59:34 -05:00
parent 9e73c55298
commit d7bad38b5d
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tools/ci/common.py
View File

@ -71,6 +71,22 @@ toolset_info = {
'toolset' : 'clang',
'version' : ''
},
'clang-5.0' : {
'deb' : ["http://apt.llvm.org/trusty/","llvm-toolchain-trusty-5.0","main"],
'apt-key' : ['http://apt.llvm.org/llvm-snapshot.gpg.key'],
'package' : 'clang-5.0',
'command' : 'clang++-5.0',
'toolset' : 'clang',
'version' : ''
},
'clang-6.0' : {
'deb' : ["http://apt.llvm.org/trusty/","llvm-toolchain-trusty-6.0","main"],
'apt-key' : ['http://apt.llvm.org/llvm-snapshot.gpg.key'],
'package' : 'clang-6.0',
'command' : 'clang++-6.0',
'toolset' : 'clang',
'version' : ''
},
'gcc-4.7' : {
'ppa' : ["ppa:ubuntu-toolchain-r/test"],
'package' : 'g++-4.7',
@ -121,6 +137,13 @@ toolset_info = {
'toolset' : 'gcc',
'version' : ''
},
'gcc-8' : {
'ppa' : ["ppa:ubuntu-toolchain-r/test"],
'package' : 'g++-8',
'command' : 'g++-8',
'toolset' : 'gcc',
'version' : ''
},
'mingw-5' : {
'toolset' : 'gcc',
'command' : 'C:\\\\MinGW\\\\bin\\\\g++.exe',
@ -221,6 +244,16 @@ toolset_info = {
'toolset' : 'clang',
'version' : ''
},
'xcode-9.0' : {
'command' : 'clang++',
'toolset' : 'clang',
'version' : ''
},
'xcode-9.1' : {
'command' : 'clang++',
'toolset' : 'clang',
'version' : ''
},
}
class SystemCallError(Exception):

11
tools/ci/library_test.py
View File

@ -94,14 +94,9 @@ class script(script_common):
if self.repo != 'boost':
utils.check_call("git","submodule","update","--quiet","--init",self.repo_path)
if self.commit:
# Checkout the library commit we are testing.
os.chdir(self.repo_dir)
if not self.pull_request:
utils.check_call("git","checkout","-qf",self.commit)
else:
utils.check_call("git","fetch","origin","-q",
"+refs/pull/{}/merge".format(self.pull_request))
utils.check_call("git","checkout","-qf","FETCH_HEAD")
# Copy in the existing library tree checkout.
os.rmdir(self.repo_path)
shutil.copytree(self.root_dir, self.repo_path)
# Fetch the dependencies for the library we are testing.
if self.repo != 'boost':