feedc0de/boost_predef
1
0
Fork 0
forked from boostorg/predef
Code Pull Requests Activity

Move to AZP for testing.

Browse Source
This commit is contained in:
Rene Rivera
2019-04-21 22:15:17 -05:00
parent 13de873d87
commit 094ac2ffdd
7 changed files with 1048 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ boost-build.jam
project-config.jam project-config.jam
*.pyc *.pyc
.vscode/settings.json .vscode/settings.json
.vscode/ipch

129
.travis.yml
View File

@ -1,129 +0,0 @@
# Use, modification, and distribution are
# subject to the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#
# Copyright Rene Rivera 2015-2018.
# Setting up notifications like this is optional as the default behavior
# of Travis is to notify the commiter of problems. But setting a specific
# recipient this way ensures you get all the communications about the
# builds.
notifications:
email:
recipients:
- grafikrobot@gmail.com
# We specify a generic language instead of C++ as Travis sets up
# additional environment vars that point to its default toolset
# instead of the one we install. The extra env doesn't interfere,
# but at the same time it's misleading. So to avoid confusion and
# possible unseen side effects we stick with no C++ default setup.
language: generic
# Speficy the default as Linux here, to avoid duplication in the matrix
# below. We use Trusty as that's the latest we can use. And it's better
# supported by the whole range of C++ toolsets we like to test on.
dist: trusty
os: linux
# Because we install our own toolsets and other software we need
# to run the sudo support.
sudo: required
# Travis has a long standing bug with their rather complicated
# build matrix evaluation that causes empty jobs to be created.
# This global matrix entry in combination with the exclusion
# below works around that bug. This is the suggested fix from
# the Travis support people.
env:
matrix:
- TRAVIS_EMPTY_JOB_WORKAROUND=true
# This lists all the toolsets we will test with the Boost CI
# scripts. Predef needs to check all of them as its job is to
# distiguish between all of them. For other libraries you would
# want to limit the list to the toolsets that are important
# for that.
matrix:
exclude:
- env: TRAVIS_EMPTY_JOB_WORKAROUND=true
include:
# Check CMake project use support.
- env: TEST_CMAKE
# Skip all the unneeded steps from the normal unit test jobs
install: true
before_script: true
before_cache: true
before_cache: true
after_success: true
after_failure: true
after_script: true
# Build CMake simple test project that uses Predef.
script:
- mkdir __build__ && cd __build__
- cmake ../test/test_cmake
- cmake --build .
- env: TOOLSET=clang-3.4
- env: TOOLSET=clang-3.5
- env: TOOLSET=clang-3.6
- env: TOOLSET=clang-3.7
- env: TOOLSET=clang-3.8
- env: TOOLSET=clang-3.9
- env: TOOLSET=clang-4.0
- env: TOOLSET=clang-5.0
- env: TOOLSET=gcc-4.7
- env: TOOLSET=gcc-4.8
- env: TOOLSET=gcc-4.9
- env: TOOLSET=gcc-5
- env: TOOLSET=gcc-6
- env: TOOLSET=gcc-7
- env: TOOLSET=gcc-8
- env: TOOLSET=gcc-8 CXXFLAGS=-std=c++03
- env: TOOLSET=gcc-8 CXXFLAGS=-std=c++11
- env: TOOLSET=gcc-8 CXXFLAGS=-std=c++14
- env: TOOLSET=gcc-8 CXXFLAGS=-std=c++17
- env: TOOLSET=gcc-8 CXXFLAGS=-std=c++2a
- env: TOOLSET=gcc-8 CXXFLAGS=-std=gnu++03
- env: TOOLSET=gcc-8 CXXFLAGS=-std=gnu++11
- env: TOOLSET=gcc-8 CXXFLAGS=-std=gnu++14
- env: TOOLSET=gcc-8 CXXFLAGS=-std=gnu++17
- env: TOOLSET=gcc-8 CXXFLAGS=-std=gnu++2a
- env: TOOLSET=xcode-6.1
os: osx
- env: TOOLSET=xcode-6.4
os: osx
osx_image: xcode6.4
- env: TOOLSET=xcode-7.3
os: osx
osx_image: xcode7.3
- env: TOOLSET=xcode-8.3
os: osx
osx_image: xcode8.3
- env: TOOLSET=xcode-9.4 CXXFLAGS=-std=c++03
os: osx
osx_image: xcode9.4
- env: TOOLSET=xcode-9.4 CXXFLAGS=-std=c++11
os: osx
osx_image: xcode9.4
- env: TOOLSET=xcode-9.4 CXXFLAGS=-std=c++14
os: osx
osx_image: xcode9.4
- env: TOOLSET=xcode-9.4 CXXFLAGS=-std=c++17
os: osx
osx_image: xcode9.4
- env: TOOLSET=xcode-9.4 CXXFLAGS=-std=c++2a
os: osx
osx_image: xcode9.4
- env: TOOLSET=xcode-10.0
os: osx
osx_image: xcode10.0
install: python "${TRAVIS_BUILD_DIR}/tools/ci/library_test.py" install
before_script: python "${TRAVIS_BUILD_DIR}/tools/ci/library_test.py" before_script
script: python "${TRAVIS_BUILD_DIR}/tools/ci/library_test.py" script
before_cache: python "${TRAVIS_BUILD_DIR}/tools/ci/library_test.py" before_cache
after_success: python "${TRAVIS_BUILD_DIR}/tools/ci/library_test.py" after_success
after_failure: python "${TRAVIS_BUILD_DIR}/tools/ci/library_test.py" after_failure
after_script: python "${TRAVIS_BUILD_DIR}/tools/ci/library_test.py" after_script

149
appveyor.yml
View File

@ -1,149 +0,0 @@
# Use, modification, and distribution are
# subject to the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#
# Copyright Rene Rivera 2015-2016.
# Set up notifications so that the maintainers of the library get
# build status messages.
notifications:
- provider: Email
to:
- grafikrobot@gmail.com
on_build_status_changed: true
# This lists all the toolsets we will test with the Boost CI
# scripts. Predef needs to check all of them as its job is to
# distiguish between all of them. For other libraries you would
# want to limit the list to the toolsets that are important
# for that.
#
# This also includes setting up how to create the cache. We
# opt for slightly better compression and solid archives.
# As we have a lot of files in the boost tree which is what
# we are putting in the cache.
environment:
APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z -m0=lzma2 -mx=3
matrix:
- TOOLSET: vs-2008
platform: 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2010
platform: 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2012
platform: 32
- TOOLSET: vs-2012
COMMENT: UWP DESKTOP
CXXFLAGS: /D_WIN32_WINNT=0x0602 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
platform: 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2012
COMMENT: UWP STORE
CXXFLAGS: /D_WIN32_WINNT=0x0602 /DWINAPI_FAMILY=WINAPI_FAMILY_APP
platform: 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2013
platform: 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2013
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2013
COMMENT: UWP DESKTOP
CXXFLAGS: /D_WIN32_WINNT=0x0603 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2013
COMMENT: UWP PHONE
CXXFLAGS: /D_WIN32_WINNT=0x0603 /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2013
COMMENT: UWP STORE
CXXFLAGS: /D_WIN32_WINNT=0x0603 /DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2015
platform: 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2015
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: vs-2017
platform: 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: vs-2017
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: vs-2017
CXXFLAGS: /std:c++14
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: vs-2017
CXXFLAGS: /std:c++latest
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: vs-2017
COMMENT: UWP DESKTOP
CXXFLAGS: /D_WIN32_WINNT=0x0A00 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: vs-2017
COMMENT: UWP PHONE
CXXFLAGS: /D_WIN32_WINNT=0x0A00 /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: vs-2017
COMMENT: UWP STORE
CXXFLAGS: /D_WIN32_WINNT=0x0A00 /DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: vs-2017
COMMENT: UWP SERVER
CXXFLAGS: /D_WIN32_WINNT=0x0A00 /DWINAPI_FAMILY=WINAPI_FAMILY_SERVER
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: vs-2017
COMMENT: UWP SYSTEM
CXXFLAGS: /D_WIN32_WINNT=0x0A00 /DWINAPI_FAMILY=WINAPI_FAMILY_SYSTEM
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: mingw-5
platform: 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: mingw64-6
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: mingw64-6
COMMENT: UWP DESKTOP
CXXFLAGS: -D_WIN32_WINNT=0x0602 -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TOOLSET: mingw64-6
COMMENT: UWP STORE
CXXFLAGS: -D_WIN32_WINNT=0x0602 -DWINAPI_FAMILY=WINAPI_FAMILY_APP
platform: 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
# We can also set up configurations for testing which map to
# the b2 build variants.
configuration:
- debug
- release
# No need to test PR branch as the PR itself is already tested.
skip_branch_with_pr: true
init:
- cd %APPVEYOR_BUILD_FOLDER%
install: python tools/ci/library_test.py install
before_build: python tools/ci/library_test.py before_build
build_script: python tools/ci/library_test.py build_script
after_build: python tools/ci/library_test.py after_build
before_test: python tools/ci/library_test.py before_test
test_script: python tools/ci/library_test.py test_script
after_test: python tools/ci/library_test.py after_test
on_success: python tools/ci/library_test.py on_success
on_failure: python tools/ci/library_test.py on_failure
on_finish: python tools/ci/library_test.py on_finish

203
azure-pipelines.yml Normal file
View File

@ -0,0 +1,203 @@
# Use, modification, and distribution are
# subject to the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#
# Copyright Rene Rivera 2019.
trigger:
branches:
include:
- develop
- master
- feature/*
pr:
branches:
include:
- develop
variables:
AZP: 1
AZP_REPO_DIR: $(Build.Repository.LocalPath)
AZP_BRANCH: $(Build.SourceBranch)
AZP_COMMIT: $(Build.SourceVersion)
AZP_REPO: $(Build.Repository.Name)
AZP_PULL_REQUEST: $(System.PullRequest.PullRequestNumber)
jobs:
- job: 'Linux'
pool:
vmImage: 'ubuntu-16.04'
strategy:
matrix:
GCC 8 (GNU):
TOOLSET: gcc-8
CXXSTD: 03,11,14,17,2a
CXXDIALECT: gnu
GCC 8 (ISO):
TOOLSET: gcc-8
CXXSTD: 03,11,14,17,2a
GCC 7:
TOOLSET: gcc-7
GCC 6:
TOOLSET: gcc-6
GCC 5:
TOOLSET: gcc-5
GCC 4.9:
TOOLSET: gcc-4.9
GCC 4.8:
TOOLSET: gcc-4.8
GCC 4.7:
TOOLSET: gcc-4.7
Clang 8:
TOOLSET: clang-8
Clang 7:
TOOLSET: clang-7
Clang 6:
TOOLSET: clang-6.0
Clang 5:
TOOLSET: clang-5.0
Clang 4:
TOOLSET: clang-4.0
Clang 3.9:
TOOLSET: clang-3.9
Clang 3.8:
TOOLSET: clang-3.8
Clang 3.7:
TOOLSET: clang-3.7
Clang 3.6:
TOOLSET: clang-3.6
Clang 3.5:
TOOLSET: clang-3.5
steps:
- task: UsePythonVersion@0
- script: python tools/ci/library_test.py install
failOnStderr: false
displayName: Install
- script: python tools/ci/library_test.py script
failOnStderr: false
displayName: Test
- job: 'macOS'
strategy:
matrix:
Xcode 10.1:
TOOLSET: xcode-10.1
XCODE_APP: /Applications/Xcode_10.1.app
VM_IMAGE: 'macOS-10.14'
Xcode 10.0:
TOOLSET: xcode-10.0
XCODE_APP: /Applications/Xcode_10.app
VM_IMAGE: 'macOS-10.14'
Xcode 9.4.1:
TOOLSET: xcode-9.4.1
XCODE_APP: /Applications/Xcode_9.4.1.app
VM_IMAGE: 'macOS-10.13'
Xcode 9.4:
TOOLSET: xcode-9.4
XCODE_APP: /Applications/Xcode_9.4.app
VM_IMAGE: 'macOS-10.13'
Xcode 9.3.1:
TOOLSET: xcode-9.3.1
XCODE_APP: /Applications/Xcode_9.3.1.app
VM_IMAGE: 'macOS-10.13'
Xcode 9.3:
TOOLSET: xcode-9.3
XCODE_APP: /Applications/Xcode_9.3.app
VM_IMAGE: 'macOS-10.13'
Xcode 9.2:
TOOLSET: xcode-9.2
XCODE_APP: /Applications/Xcode_9.2.app
VM_IMAGE: 'macOS-10.13'
Xcode 9.1:
TOOLSET: xcode-9.1
XCODE_APP: /Applications/Xcode_9.1.app
VM_IMAGE: 'macOS-10.13'
Xcode 9.0.1:
TOOLSET: xcode-9.0.1
XCODE_APP: /Applications/Xcode_9.0.1.app
VM_IMAGE: 'macOS-10.13'
Xcode 9.0:
TOOLSET: xcode-9.0
XCODE_APP: /Applications/Xcode_9.app
VM_IMAGE: 'macOS-10.13'
Xcode 8.3.3:
TOOLSET: xcode-8.3
XCODE_APP: /Applications/Xcode_8.3.3.app
VM_IMAGE: 'macOS-10.13'
pool:
vmImage: $(VM_IMAGE)
steps:
- task: UsePythonVersion@0
- script: sudo xcode-select -switch ${XCODE_APP}
failOnStderr: false
displayName: Xcode Select
- script: python tools/ci/library_test.py install
failOnStderr: false
displayName: Install
- script: python tools/ci/library_test.py script
failOnStderr: false
displayName: Test
- job: 'Windows'
strategy:
matrix:
VS 2019:
TOOLSET: vs-2019
ADDRESS_MODEL: 32,64
CXXSTD: 14,latest
VM_IMAGE: 'windows-2019'
VS 2019 (UWP DESKTOP):
TOOLSET: vs-2019
ADDRESS_MODEL: 64
CXXDEFS: _WIN32_WINNT=0x0A00,WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
VM_IMAGE: 'windows-2019'
VS 2019 (UWP PHONE):
TOOLSET: vs-2019
ADDRESS_MODEL: 64
CXXDEFS: _WIN32_WINNT=0x0A00,WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
VM_IMAGE: 'windows-2019'
VS 2019 (UWP STORE):
TOOLSET: vs-2019
ADDRESS_MODEL: 64
CXXDEFS: _WIN32_WINNT=0x0A00,WINAPI_FAMILY=WINAPI_FAMILY_PC_APP
VM_IMAGE: 'windows-2019'
VS 2019 (UWP SERVER):
TOOLSET: vs-2019
ADDRESS_MODEL: 64
CXXDEFS: _WIN32_WINNT=0x0A00,WINAPI_FAMILY=WINAPI_FAMILY_SERVER
VM_IMAGE: 'windows-2019'
VS 2019 (UWP SYSTEM):
TOOLSET: vs-2019
ADDRESS_MODEL: 64
CXXDEFS: _WIN32_WINNT=0x0A00,WINAPI_FAMILY=WINAPI_FAMILY_SYSTEM
VM_IMAGE: 'windows-2019'
VS 2017:
TOOLSET: vs-2017
VM_IMAGE: 'vs2017-win2016'
VS 2015:
TOOLSET: vs-2015
VM_IMAGE: 'vs2015-win2012r2'
VS 2013:
TOOLSET: vs-2013
VM_IMAGE: 'vs2015-win2012r2'
MinGW 8.1.0:
TOOLSET: mingw-8
VM_IMAGE: 'vs2017-win2016'
MinGW 8.1.0 (UWP DESKTOP):
TOOLSET: mingw-8
CXXDEFS: _WIN32_WINNT=0x0A00,WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
VM_IMAGE: 'vs2017-win2016'
MinGW 8.1.0 (UWP STORE):
TOOLSET: mingw-8
CXXDEFS: _WIN32_WINNT=0x0A00,WINAPI_FAMILY=WINAPI_FAMILY_PC_APP
VM_IMAGE: 'vs2017-win2016'
pool:
vmImage: $(VM_IMAGE)
steps:
- script: python tools/ci/library_test.py install
failOnStderr: false
displayName: Install
- script: python tools/ci/library_test.py script
failOnStderr: false
displayName: Test

352
tools/ci/build_log.py
View File

@ -1,9 +1,10 @@
#!/usr/bin/env python
# Copyright 2008 Rene Rivera # Copyright 2008-2019 Rene Rivera
# Distributed under the Boost Software License, Version 1.0. # Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
from __future__ import print_function
import re import re
import optparse import optparse
import time import time
@ -12,32 +13,33 @@ import xml.dom.pulldom
from xml.sax.saxutils import unescape, escape from xml.sax.saxutils import unescape, escape
import os.path import os.path
from pprint import pprint from pprint import pprint
from __builtin__ import exit from sys import exit
class BuildOutputXMLParsing(object): class BuildOutputXMLParsing(object):
''' '''
XML parsing utilities for dealing with the Boost Build output XML parsing utilities for dealing with the Boost Build output
XML format. XML format.
''' '''
def get_child_data( self, root, tag = None, id = None, name = None, strip = False, default = None ): def get_child_data(self, root, tag=None, id=None, name=None, strip=False, default=None):
return self.get_data(self.get_child(root,tag=tag,id=id,name=name),strip=strip,default=default) return self.get_data(self.get_child(root, tag=tag, id=id, name=name), strip=strip, default=default)
def get_data( self, node, strip = False, default = None ): def get_data(self, node, strip=False, default=None):
data = None data = None
if node: if node:
data_node = None data_node = None
if not data_node: if not data_node:
data_node = self.get_child(node,tag='#text') data_node = self.get_child(node, tag='#text')
if not data_node: if not data_node:
data_node = self.get_child(node,tag='#cdata-section') data_node = self.get_child(node, tag='#cdata-section')
data = "" data = ""
while data_node: while data_node:
data += data_node.data data += data_node.data
data_node = data_node.nextSibling data_node = data_node.nextSibling
if data_node: if data_node:
if data_node.nodeName != '#text' \ if data_node.nodeName != '#text' \
and data_node.nodeName != '#cdata-section': and data_node.nodeName != '#cdata-section':
data_node = None data_node = None
if not data: if not data:
data = default data = default
@ -45,11 +47,11 @@ class BuildOutputXMLParsing(object):
if strip: if strip:
data = data.strip() data = data.strip()
return data return data
def get_child( self, root, tag = None, id = None, name = None, type = None ): def get_child(self, root, tag=None, id=None, name=None, type=None):
return self.get_sibling(root.firstChild,tag=tag,id=id,name=name,type=type) return self.get_sibling(root.firstChild, tag=tag, id=id, name=name, type=type)
def get_sibling( self, sibling, tag = None, id = None, name = None, type = None ): def get_sibling(self, sibling, tag=None, id=None, name=None, type=None):
n = sibling n = sibling
while n: while n:
found = True found = True
@ -63,16 +65,19 @@ class BuildOutputXMLParsing(object):
if n.hasAttribute('id'): if n.hasAttribute('id'):
found = found and n.getAttribute('id') == id found = found and n.getAttribute('id') == id
else: else:
found = found and n.hasAttribute('id') and n.getAttribute('id') == id found = found and n.hasAttribute(
'id') and n.getAttribute('id') == id
if name and found: if name and found:
found = found and n.hasAttribute('name') and n.getAttribute('name') == name found = found and n.hasAttribute(
'name') and n.getAttribute('name') == name
if found: if found:
return n return n
n = n.nextSibling n = n.nextSibling
return None return None
class BuildOutputProcessor(BuildOutputXMLParsing): class BuildOutputProcessor(BuildOutputXMLParsing):
def __init__(self, inputs): def __init__(self, inputs):
self.test = {} self.test = {}
self.target_to_test = {} self.target_to_test = {}
@ -81,14 +86,14 @@ class BuildOutputProcessor(BuildOutputXMLParsing):
self.timestamps = [] self.timestamps = []
for input in inputs: for input in inputs:
self.add_input(input) self.add_input(input)
def add_input(self, input): def add_input(self, input):
''' '''
Add a single build XML output file to our data. Add a single build XML output file to our data.
''' '''
events = xml.dom.pulldom.parse(input) events = xml.dom.pulldom.parse(input)
context = [] context = []
for (event,node) in events: for (event, node) in events:
if event == xml.dom.pulldom.START_ELEMENT: if event == xml.dom.pulldom.START_ELEMENT:
context.append(node) context.append(node)
if node.nodeType == xml.dom.Node.ELEMENT_NODE: if node.nodeType == xml.dom.Node.ELEMENT_NODE:
@ -101,25 +106,25 @@ class BuildOutputProcessor(BuildOutputXMLParsing):
(x_f[1])(node) (x_f[1])(node)
elif event == xml.dom.pulldom.END_ELEMENT: elif event == xml.dom.pulldom.END_ELEMENT:
context.pop() context.pop()
def x_name_(self, *context, **kwargs): def x_name_(self, *context, **kwargs):
node = None node = None
names = [ ] names = []
for c in context: for c in context:
if c: if c:
if not isinstance(c,xml.dom.Node): if not isinstance(c, xml.dom.Node):
suffix = '_'+c.replace('-','_').replace('#','_') suffix = '_'+c.replace('-', '_').replace('#', '_')
else: else:
suffix = '_'+c.nodeName.replace('-','_').replace('#','_') suffix = '_'+c.nodeName.replace('-', '_').replace('#', '_')
node = c node = c
names.append('x') names.append('x')
names = map(lambda x: x+suffix,names) names = [x+suffix for x in names]
if node: if node:
for name in names: for name in names:
if hasattr(self,name): if hasattr(self, name):
return (name,getattr(self,name)) return (name, getattr(self, name))
return None return None
def x_build_test(self, node): def x_build_test(self, node):
''' '''
Records the initial test information that will eventually Records the initial test information that will eventually
@ -127,100 +132,102 @@ class BuildOutputProcessor(BuildOutputXMLParsing):
''' '''
test_node = node test_node = node
test_name = test_node.getAttribute('name') test_name = test_node.getAttribute('name')
test_target = self.get_child_data(test_node,tag='target',strip=True) test_target = self.get_child_data(test_node, tag='target', strip=True)
## print ">>> %s %s" %(test_name,test_target) # print ">>> %s %s" %(test_name,test_target)
self.test[test_name] = { self.test[test_name] = {
'library' : "/".join(test_name.split('/')[0:-1]), 'library': "/".join(test_name.split('/')[0:-1]),
'test-name' : test_name.split('/')[-1], 'test-name': test_name.split('/')[-1],
'test-type' : test_node.getAttribute('type').lower(), 'test-type': test_node.getAttribute('type').lower(),
'test-program' : self.get_child_data(test_node,tag='source',strip=True), 'test-program': self.get_child_data(test_node, tag='source', strip=True),
'target' : test_target, 'target': test_target,
'info' : self.get_child_data(test_node,tag='info',strip=True), 'info': self.get_child_data(test_node, tag='info', strip=True),
'dependencies' : [], 'dependencies': [],
'actions' : [], 'actions': [],
} }
# Add a lookup for the test given the test target. # Add a lookup for the test given the test target.
self.target_to_test[self.test[test_name]['target']] = test_name self.target_to_test[self.test[test_name]['target']] = test_name
return None return None
def x_build_targets_target( self, node ): def x_build_targets_target(self, node):
''' '''
Process the target dependency DAG into an ancestry tree so we can look up Process the target dependency DAG into an ancestry tree so we can look up
which top-level library and test targets specific build actions correspond to. which top-level library and test targets specific build actions correspond to.
''' '''
target_node = node target_node = node
name = self.get_child_data(target_node,tag='name',strip=True) name = self.get_child_data(target_node, tag='name', strip=True)
path = self.get_child_data(target_node,tag='path',strip=True) path = self.get_child_data(target_node, tag='path', strip=True)
jam_target = self.get_child_data(target_node,tag='jam-target',strip=True) jam_target = self.get_child_data(
#~ Map for jam targets to virtual targets. target_node, tag='jam-target', strip=True)
# ~ Map for jam targets to virtual targets.
self.target[jam_target] = { self.target[jam_target] = {
'name' : name, 'name': name,
'path' : path 'path': path
} }
#~ Create the ancestry. # ~ Create the ancestry.
dep_node = self.get_child(self.get_child(target_node,tag='dependencies'),tag='dependency') dep_node = self.get_child(self.get_child(
target_node, tag='dependencies'), tag='dependency')
while dep_node: while dep_node:
child = self.get_data(dep_node,strip=True) child = self.get_data(dep_node, strip=True)
child_jam_target = '<p%s>%s' % (path,child.split('//',1)[1]) child_jam_target = '<p%s>%s' % (path, child.split('//', 1)[1])
self.parent[child_jam_target] = jam_target self.parent[child_jam_target] = jam_target
dep_node = self.get_sibling(dep_node.nextSibling,tag='dependency') dep_node = self.get_sibling(dep_node.nextSibling, tag='dependency')
return None return None
def x_build_action( self, node ): def x_build_action(self, node):
''' '''
Given a build action log, process into the corresponding test log and Given a build action log, process into the corresponding test log and
specific test log sub-part. specific test log sub-part.
''' '''
action_node = node action_node = node
name = self.get_child(action_node,tag='name') name = self.get_child(action_node, tag='name')
if name: if name:
name = self.get_data(name) name = self.get_data(name)
#~ Based on the action, we decide what sub-section the log # ~ Based on the action, we decide what sub-section the log
#~ should go into. # ~ should go into.
action_type = None action_type = None
if re.match('[^%]+%[^.]+[.](compile)',name): if re.match('[^%]+%[^.]+[.](compile)', name):
action_type = 'compile' action_type = 'compile'
elif re.match('[^%]+%[^.]+[.](link|archive)',name): elif re.match('[^%]+%[^.]+[.](link|archive)', name):
action_type = 'link' action_type = 'link'
elif re.match('[^%]+%testing[.](capture-output)',name): elif re.match('[^%]+%testing[.](capture-output)', name):
action_type = 'run' action_type = 'run'
elif re.match('[^%]+%testing[.](expect-failure|expect-success)',name): elif re.match('[^%]+%testing[.](expect-failure|expect-success)', name):
action_type = 'result' action_type = 'result'
else: else:
# TODO: Enable to see what other actions can be included in the test results. # TODO: Enable to see what other actions can be included in the test results.
# action_type = None # action_type = None
action_type = 'other' action_type = 'other'
#~ print "+ [%s] %s %s :: %s" %(action_type,name,'','') # ~ print "+ [%s] %s %s :: %s" %(action_type,name,'','')
if action_type: if action_type:
#~ Get the corresponding test. # ~ Get the corresponding test.
(target,test) = self.get_test(action_node,type=action_type) (target, test) = self.get_test(action_node, type=action_type)
#~ Skip action that have no corresponding test as they are # ~ Skip action that have no corresponding test as they are
#~ regular build actions and don't need to show up in the # ~ regular build actions and don't need to show up in the
#~ regression results. # ~ regression results.
if not test: if not test:
##print "??? [%s] %s %s :: %s" %(action_type,name,target,test) # print "??? [%s] %s %s :: %s" %(action_type,name,target,test)
return None return None
##print "+++ [%s] %s %s :: %s" %(action_type,name,target,test) # print "+++ [%s] %s %s :: %s" %(action_type,name,target,test)
#~ Collect some basic info about the action. # ~ Collect some basic info about the action.
action = { action = {
'command' : self.get_action_command(action_node,action_type), 'command': self.get_action_command(action_node, action_type),
'output' : self.get_action_output(action_node,action_type), 'output': self.get_action_output(action_node, action_type),
'info' : self.get_action_info(action_node,action_type) 'info': self.get_action_info(action_node, action_type)
} }
#~ For the test result status we find the appropriate node # ~ For the test result status we find the appropriate node
#~ based on the type of test. Then adjust the result status # ~ based on the type of test. Then adjust the result status
#~ accordingly. This makes the result status reflect the # ~ accordingly. This makes the result status reflect the
#~ expectation as the result pages post processing does not # ~ expectation as the result pages post processing does not
#~ account for this inversion. # ~ account for this inversion.
action['type'] = action_type action['type'] = action_type
if action_type == 'result': if action_type == 'result':
if re.match(r'^compile',test['test-type']): if re.match(r'^compile', test['test-type']):
action['type'] = 'compile' action['type'] = 'compile'
elif re.match(r'^link',test['test-type']): elif re.match(r'^link', test['test-type']):
action['type'] = 'link' action['type'] = 'link'
elif re.match(r'^run',test['test-type']): elif re.match(r'^run', test['test-type']):
action['type'] = 'run' action['type'] = 'run'
#~ The result sub-part we will add this result to. # ~ The result sub-part we will add this result to.
if action_node.getAttribute('status') == '0': if action_node.getAttribute('status') == '0':
action['result'] = 'succeed' action['result'] = 'succeed'
else: else:
@ -231,120 +238,126 @@ class BuildOutputProcessor(BuildOutputXMLParsing):
if action_type == 'result': if action_type == 'result':
test['result'] = action['result'] test['result'] = action['result']
return None return None
def x_build_timestamp( self, node ): def x_build_timestamp(self, node):
''' '''
The time-stamp goes to the corresponding attribute in the result. The time-stamp goes to the corresponding attribute in the result.
''' '''
self.timestamps.append(self.get_data(node).strip()) self.timestamps.append(self.get_data(node).strip())
return None return None
def get_test( self, node, type = None ): def get_test(self, node, type=None):
''' '''
Find the test corresponding to an action. For testing targets these Find the test corresponding to an action. For testing targets these
are the ones pre-declared in the --dump-test option. For libraries are the ones pre-declared in the --dump-test option. For libraries
we create a dummy test as needed. we create a dummy test as needed.
''' '''
jam_target = self.get_child_data(node,tag='jam-target') jam_target = self.get_child_data(node, tag='jam-target')
base = self.target[jam_target]['name'] base = self.target[jam_target]['name']
target = jam_target target = jam_target
while target in self.parent: while target in self.parent:
target = self.parent[target] target = self.parent[target]
#~ print "--- TEST: %s ==> %s" %(jam_target,target) # ~ print "--- TEST: %s ==> %s" %(jam_target,target)
#~ main-target-type is a precise indicator of what the build target is # ~ main-target-type is a precise indicator of what the build target is
#~ originally meant to be. # ~ originally meant to be.
#main_type = self.get_child_data(self.get_child(node,tag='properties'), # main_type = self.get_child_data(self.get_child(node,tag='properties'),
# name='main-target-type',strip=True) # name='main-target-type',strip=True)
main_type = None main_type = None
if main_type == 'LIB' and type: if main_type == 'LIB' and type:
lib = self.target[target]['name'] lib = self.target[target]['name']
if not lib in self.test: if not lib in self.test:
self.test[lib] = { self.test[lib] = {
'library' : re.search(r'libs/([^/]+)',lib).group(1), 'library': re.search(r'libs/([^/]+)', lib).group(1),
'test-name' : os.path.basename(lib), 'test-name': os.path.basename(lib),
'test-type' : 'lib', 'test-type': 'lib',
'test-program' : os.path.basename(lib), 'test-program': os.path.basename(lib),
'target' : lib 'target': lib
} }
test = self.test[lib] test = self.test[lib]
else: else:
target_name_ = self.target[target]['name'] target_name_ = self.target[target]['name']
if self.target_to_test.has_key(target_name_): if target_name_ in self.target_to_test:
test = self.test[self.target_to_test[target_name_]] test = self.test[self.target_to_test[target_name_]]
else: else:
test = None test = None
return (base,test) return (base, test)
#~ The command executed for the action. For run actions we omit the command # ~ The command executed for the action. For run actions we omit the command
#~ as it's just noise. # ~ as it's just noise.
def get_action_command( self, action_node, action_type ): def get_action_command(self, action_node, action_type):
if action_type != 'run': if action_type != 'run':
return self.get_child_data(action_node,tag='command') return self.get_child_data(action_node, tag='command')
else: else:
return '' return ''
#~ The command output. # ~ The command output.
def get_action_output( self, action_node, action_type ): def get_action_output(self, action_node, action_type):
return self.get_child_data(action_node,tag='output',default='') return self.get_child_data(action_node, tag='output', default='')
#~ Some basic info about the action. # ~ Some basic info about the action.
def get_action_info( self, action_node, action_type ): def get_action_info(self, action_node, action_type):
info = {} info = {}
#~ The jam action and target. # ~ The jam action and target.
info['name'] = self.get_child_data(action_node,tag='name') info['name'] = self.get_child_data(action_node, tag='name')
info['path'] = self.get_child_data(action_node,tag='path') info['path'] = self.get_child_data(action_node, tag='path')
#~ The timing of the action. # ~ The timing of the action.
info['time-start'] = action_node.getAttribute('start') info['time-start'] = action_node.getAttribute('start')
info['time-end'] = action_node.getAttribute('end') info['time-end'] = action_node.getAttribute('end')
info['time-user'] = action_node.getAttribute('user') info['time-user'] = action_node.getAttribute('user')
info['time-system'] = action_node.getAttribute('system') info['time-system'] = action_node.getAttribute('system')
#~ Testing properties. # ~ Testing properties.
test_info_prop = self.get_child_data(self.get_child(action_node,tag='properties'),name='test-info') test_info_prop = self.get_child_data(self.get_child(
action_node, tag='properties'), name='test-info')
info['always_show_run_output'] = test_info_prop == 'always_show_run_output' info['always_show_run_output'] = test_info_prop == 'always_show_run_output'
#~ And for compiles some context that may be hidden if using response files. # ~ And for compiles some context that may be hidden if using response files.
if action_type == 'compile': if action_type == 'compile':
info['define'] = [] info['define'] = []
define = self.get_child(self.get_child(action_node,tag='properties'),name='define') define = self.get_child(self.get_child(
action_node, tag='properties'), name='define')
while define: while define:
info['define'].append(self.get_data(define,strip=True)) info['define'].append(self.get_data(define, strip=True))
define = self.get_sibling(define.nextSibling,name='define') define = self.get_sibling(define.nextSibling, name='define')
return info return info
class BuildConsoleSummaryReport(object): class BuildConsoleSummaryReport(object):
HEADER = '\033[35m\033[1m' HEADER = '\033[35m\033[1m'
INFO = '\033[34m' INFO = '\033[34m'
OK = '\033[32m' OK = '\033[32m'
WARNING = '\033[33m' WARNING = '\033[33m'
FAIL = '\033[31m' FAIL = '\033[31m'
ENDC = '\033[0m' ENDC = '\033[0m'
def __init__(self, bop, opt): def __init__(self, bop, opt):
self.bop = bop self.bop = bop
def generate(self): def generate(self):
self.summary_info = { self.summary_info = {
'total' : 0, 'total': 0,
'success' : 0, 'success': 0,
'failed' : [], 'failed': [],
} }
self.header_print("======================================================================") self.header_print(
"======================================================================")
self.print_test_log() self.print_test_log()
self.print_summary() self.print_summary()
self.header_print("======================================================================") self.header_print(
"======================================================================")
@property @property
def failed(self): def failed(self):
return len(self.summary_info['failed']) > 0 return len(self.summary_info['failed']) > 0
def print_test_log(self): def print_test_log(self):
self.header_print("Tests run..") self.header_print("Tests run..")
self.header_print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") self.header_print(
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
for k in sorted(self.bop.test.keys()): for k in sorted(self.bop.test.keys()):
test = self.bop.test[k] test = self.bop.test[k]
if len(test['actions']) > 0: if len(test['actions']) > 0:
self.summary_info['total'] += 1 self.summary_info['total'] += 1
##print ">>>> {0}".format(test['test-name']) # print ">>>> {0}".format(test['test-name'])
if 'result' in test: if 'result' in test:
succeed = test['result'] == 'succeed' succeed = test['result'] == 'succeed'
else: else:
@ -354,12 +367,12 @@ class BuildConsoleSummaryReport(object):
else: else:
self.summary_info['failed'].append(test) self.summary_info['failed'].append(test)
if succeed: if succeed:
self.ok_print("[PASS] {0}",k) self.ok_print("[PASS] {0}", k)
else: else:
self.fail_print("[FAIL] {0}",k) self.fail_print("[FAIL] {0}", k)
for action in test['actions']: for action in test['actions']:
self.print_action(succeed, action) self.print_action(succeed, action)
def print_action(self, test_succeed, action): def print_action(self, test_succeed, action):
''' '''
Print the detailed info of failed or always print tests. Print the detailed info of failed or always print tests.
@ -370,50 +383,54 @@ class BuildConsoleSummaryReport(object):
if output != "": if output != "":
p = self.fail_print if action['result'] == 'fail' else self.p_print p = self.fail_print if action['result'] == 'fail' else self.p_print
self.info_print("") self.info_print("")
self.info_print("({0}) {1}",action['info']['name'],action['info']['path']) self.info_print(
"({0}) {1}", action['info']['name'], action['info']['path'])
p("") p("")
p("{0}",action['command'].strip()) p("{0}", action['command'].strip())
p("") p("")
for line in output.splitlines(): for line in output.splitlines():
p("{0}",line.encode('utf-8')) p("{0}", line.encode('utf-8'))
def print_summary(self): def print_summary(self):
self.header_print("") self.header_print("")
self.header_print("Testing summary..") self.header_print("Testing summary..")
self.header_print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") self.header_print(
self.p_print("Total: {0}",self.summary_info['total']) "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
self.p_print("Success: {0}",self.summary_info['success']) self.p_print("Total: {0}", self.summary_info['total'])
self.p_print("Success: {0}", self.summary_info['success'])
if self.failed: if self.failed:
self.fail_print("Failed: {0}",len(self.summary_info['failed'])) self.fail_print("Failed: {0}", len(self.summary_info['failed']))
for test in self.summary_info['failed']: for test in self.summary_info['failed']:
self.fail_print(" {0}/{1}",test['library'],test['test-name']) self.fail_print(
" {0}/{1}", test['library'], test['test-name'])
def p_print(self, format, *args, **kargs): def p_print(self, format, *args, **kargs):
print format.format(*args,**kargs) print(format.format(*args, **kargs))
def info_print(self, format, *args, **kargs): def info_print(self, format, *args, **kargs):
print self.INFO+format.format(*args,**kargs)+self.ENDC print(self.INFO+format.format(*args, **kargs)+self.ENDC)
def header_print(self, format, *args, **kargs): def header_print(self, format, *args, **kargs):
print self.HEADER+format.format(*args,**kargs)+self.ENDC print(self.HEADER+format.format(*args, **kargs)+self.ENDC)
def ok_print(self, format, *args, **kargs): def ok_print(self, format, *args, **kargs):
print self.OK+format.format(*args,**kargs)+self.ENDC print(self.OK+format.format(*args, **kargs)+self.ENDC)
def warn_print(self, format, *args, **kargs): def warn_print(self, format, *args, **kargs):
print self.WARNING+format.format(*args,**kargs)+self.ENDC print(self.WARNING+format.format(*args, **kargs)+self.ENDC)
def fail_print(self, format, *args, **kargs): def fail_print(self, format, *args, **kargs):
print self.FAIL+format.format(*args,**kargs)+self.ENDC print(self.FAIL+format.format(*args, **kargs)+self.ENDC)
class Main(object): class Main(object):
def __init__(self,args=None): def __init__(self, args=None):
op = optparse.OptionParser( op = optparse.OptionParser(
usage="%prog [options] input+") usage="%prog [options] input+")
op.add_option( '--output', op.add_option('--output',
help="type of output to generate" ) help="type of output to generate")
( opt, inputs ) = op.parse_args(args) (opt, inputs) = op.parse_args(args)
bop = BuildOutputProcessor(inputs) bop = BuildOutputProcessor(inputs)
output = None output = None
if opt.output == 'console': if opt.output == 'console':
@ -422,6 +439,7 @@ class Main(object):
output.generate() output.generate()
self.failed = output.failed self.failed = output.failed
if __name__ == '__main__': if __name__ == '__main__':
m = Main() m = Main()
if m.failed: if m.failed:

1076
tools/ci/common.py
View File

File diff suppressed because it is too large Load Diff

117
tools/ci/library_test.py
View File

@ -1,11 +1,12 @@
#!/usr/bin/env python
# Copyright Rene Rivera 2016 # Copyright Rene Rivera 2016-2019
# #
# Distributed under the Boost Software License, Version 1.0. # Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at # (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt) # http://www.boost.org/LICENSE_1_0.txt)
from __future__ import print_function
import os.path import os.path
import shutil import shutil
import sys import sys
@ -13,6 +14,7 @@ from common import toolset_info, main, utils, script_common, ci_cli, set_arg
__dirname__ = os.path.dirname(os.path.realpath(__file__)) __dirname__ = os.path.dirname(os.path.realpath(__file__))
class script(script_common): class script(script_common):
''' '''
Main script to test a Boost C++ Library. Main script to test a Boost C++ Library.
@ -20,21 +22,27 @@ class script(script_common):
def __init__(self, ci_klass, **kargs): def __init__(self, ci_klass, **kargs):
script_common.__init__(self, ci_klass, **kargs) script_common.__init__(self, ci_klass, **kargs)
def init(self, opt, kargs): def init(self, opt, kargs):
opt.add_option( '--toolset', opt.add_option(
help="single toolset to test with" ) '--toolset',
opt.add_option( '--target', help="single toolset to test with")
opt.add_option(
'--target',
help="test target to build for testing, defaults to TARGET or 'minimal'") help="test target to build for testing, defaults to TARGET or 'minimal'")
opt.add_option( '--address-model', opt.add_option(
help="address model to test, ie 64 or 32" ) '--address-model',
opt.add_option( '--variant', help="address model to test, ie 64 or 32")
help="variant to test, ie debug, release" ) opt.add_option(
'--variant',
help="variant to test, ie debug, release")
set_arg(kargs, 'toolset', os.getenv("TOOLSET")) set_arg(kargs, 'toolset', os.getenv("TOOLSET"))
set_arg(kargs, 'target', os.getenv('TARGET', 'minimal')) set_arg(kargs, 'target', os.getenv('TARGET', 'minimal'))
set_arg(kargs, 'address_model', os.getenv("ADDRESS_MODEL",None)) set_arg(kargs, 'address_model', os.getenv("ADDRESS_MODEL", None))
set_arg(kargs, 'variant', os.getenv("VARIANT","debug")) set_arg(kargs, 'variant', os.getenv("VARIANT", "debug"))
set_arg(kargs, 'cxxflags', os.getenv("CXXFLAGS",None)) set_arg(kargs, 'cxxstd', os.getenv("CXXSTD", None))
set_arg(kargs, 'cxxdialect', os.getenv("CXXDIALECT", None))
set_arg(kargs, 'cxxdefs', os.getenv("CXXDEFS", None))
return kargs return kargs
def start(self): def start(self):
@ -45,48 +53,41 @@ class script(script_common):
def command_install(self): def command_install(self):
script_common.command_install(self) script_common.command_install(self)
# Fetch & install toolset.. # Fetch & install toolset..
utils.log( "Install toolset: %s"%(self.toolset) ) utils.log("Install toolset: %s" % (self.toolset))
if self.toolset: if self.toolset:
self.command_install_toolset(self.toolset) self.command_install_toolset(self.toolset)
def command_before_build(self): def command_before_build(self):
script_common.command_before_build(self) script_common.command_before_build(self)
# Fetch dependencies. # Fetch dependencies.
utils.git_clone('boostorg','build','develop',repo_dir=self.b2_dir) utils.git_clone('boostorg', 'build', 'develop', repo_dir=self.b2_dir)
# Create config file for b2 toolset. # Create config file for b2 toolset.
if not isinstance(self.ci, ci_cli): if not isinstance(self.ci, ci_cli):
cxxflags = None
if self.cxxflags:
cxxflags = self.cxxflags.split()
cxxflags = " <cxxflags>".join(cxxflags)
utils.make_file(os.path.join(self.repo_dir, 'project-config.jam'), utils.make_file(os.path.join(self.repo_dir, 'project-config.jam'),
""" """
using %(toolset)s : %(version)s : %(command)s : %(cxxflags)s ; using %(toolset)s : %(version)s : %(command)s ;
using python : %(pyversion)s : "%(python)s" ; """ % {
"""%{ 'toolset': toolset_info[self.toolset]['toolset'],
'toolset':toolset_info[self.toolset]['toolset'], 'version': toolset_info[self.toolset]['version'],
'version':toolset_info[self.toolset]['version'], 'command': toolset_info[self.toolset]['command'],
'command':toolset_info[self.toolset]['command'], })
'cxxflags':"<cxxflags>"+cxxflags if cxxflags else "",
'pyversion':"%s.%s"%(sys.version_info[0],sys.version_info[1]), # # "Convert" boostorg-predef into standalone b2 project.
'python':sys.executable.replace("\\","\\\\") # if os.path.exists(os.path.join(self.repo_dir, 'build.jam')) and not os.path.exists(os.path.join(self.repo_dir, 'project-root.jam')):
}) # os.rename(os.path.join(self.repo_dir, 'build.jam'),
# os.path.join(self.repo_dir, 'project-root.jam'))
# "Convert" boostorg-predef into standalone b2 project.
if os.path.exists(os.path.join(self.repo_dir,'build.jam')) and not os.path.exists(os.path.join(self.repo_dir,'project-root.jam')):
os.rename(os.path.join(self.repo_dir,'build.jam'), os.path.join(self.repo_dir,'project-root.jam'))
def command_build(self): def command_build(self):
script_common.command_build(self) script_common.command_build(self)
# Set up tools. # Set up tools.
if not isinstance(self.ci, ci_cli) and toolset_info[self.toolset]['command']: if not isinstance(self.ci, ci_cli) and toolset_info[self.toolset]['command']:
os.environ['PATH'] = os.pathsep.join([ os.environ['PATH'] = os.pathsep.join([
os.path.dirname(toolset_info[self.toolset]['command']), os.path.dirname(toolset_info[self.toolset]['command']),
os.environ['PATH']]) os.environ['PATH']])
# Bootstrap Boost Build engine. # Bootstrap Boost Build engine.
os.chdir(self.b2_dir) os.chdir(self.b2_dir)
if sys.platform == 'win32': if sys.platform == 'win32':
@ -95,35 +96,44 @@ using python : %(pyversion)s : "%(python)s" ;
utils.check_call("./bootstrap.sh") utils.check_call("./bootstrap.sh")
os.environ['PATH'] = os.pathsep.join([self.b2_dir, os.environ['PATH']]) os.environ['PATH'] = os.pathsep.join([self.b2_dir, os.environ['PATH']])
os.environ['BOOST_BUILD_PATH'] = self.b2_dir os.environ['BOOST_BUILD_PATH'] = self.b2_dir
# Run the limited tests. # Run the limited tests.
print("--- Testing %s ---"%(self.repo_dir)) print("--- Testing %s ---" % (self.repo_dir))
os.chdir(os.path.join(self.repo_dir,'test')) os.chdir(os.path.join(self.repo_dir, 'test'))
toolset_to_test = "" toolset_to_test = ""
if self.toolset: if self.toolset:
if not isinstance(self.ci, ci_cli): if not isinstance(self.ci, ci_cli):
toolset_to_test = toolset_info[self.toolset]['toolset'] toolset_to_test = toolset_info[self.toolset]['toolset']
else: else:
toolset_to_test = self.toolset toolset_to_test = self.toolset
cxxdefs = []
if self.cxxdefs:
cxxdefs = ['define=%s' % (d) for d in self.cxxdefs.split(',')]
self.b2( self.b2(
'-d1', '-d1',
'-p0', '-p0',
'preserve-test-targets=off', 'preserve-test-targets=off',
'--dump-tests', '--dump-tests',
'--verbose-test', '--verbose-test',
'--build-dir=%s'%(self.build_dir), '--build-dir=%s' % (self.build_dir),
'--out-xml=%s'%(os.path.join(self.build_dir,'regression.xml')), '--out-xml=%s' % (os.path.join(self.build_dir, 'regression.xml')),
'' if not toolset_to_test else 'toolset=%s'%(toolset_to_test), '' if not toolset_to_test else 'toolset=%s' % (toolset_to_test),
'' if not self.address_model else 'address-model=%s'%(self.address_model), '' if not self.address_model else 'address-model=%s' % (
'variant=%s'%(self.variant), self.address_model),
self.target 'variant=%s' % (self.variant),
) '' if not self.cxxstd else 'cxxstd=%s' % (
self.cxxstd),
'' if not self.cxxdialect else 'cxxstd-dialect=%s' % (
self.cxxdialect),
self.target,
*cxxdefs
)
# Generate a readable test report. # Generate a readable test report.
import build_log import build_log
log_main = build_log.Main([ log_main = build_log.Main([
'--output=console', '--output=console',
os.path.join(self.build_dir,'regression.xml')]) os.path.join(self.build_dir, 'regression.xml')])
# And exit with an error if the report contains failures. # And exit with an error if the report contains failures.
# This lets the CI notice the error and report a failed build. # This lets the CI notice the error and report a failed build.
# And hence trigger the failure machinery, like sending emails. # And hence trigger the failure machinery, like sending emails.
@ -133,9 +143,10 @@ using python : %(pyversion)s : "%(python)s" ;
def command_before_cache(self): def command_before_cache(self):
script_common.command_before_cache(self) script_common.command_before_cache(self)
os.chdir(self.b2_dir) os.chdir(self.b2_dir)
utils.check_call("git","clean","-dfqx") utils.check_call("git", "clean", "-dfqx")
utils.check_call("git","status","-bs") utils.check_call("git", "status", "-bs")
# utils.check_call("git","submodule","--quiet","foreach","git","clean","-dfqx") # utils.check_call("git","submodule","--quiet","foreach","git","clean","-dfqx")
# utils.check_call("git","submodule","foreach","git","status","-bs") # utils.check_call("git","submodule","foreach","git","status","-bs")
main(script) main(script)