boostorg/core
1
0
Fork 1
mirror of https://github.com/boostorg/core.git synced 2025-08-03 14:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Peter Dimov
2016-09-30 16:08:59 +03:00
parent 9df5059786 8156259043
commit 0a50557410
5 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@@ -16,20 +16,18 @@ branches:
- develop - develop
install: install:
- git clone -b $TRAVIS_BRANCH https://github.com/boostorg/boost.git boost - cd ..
- cd boost - git clone -b $TRAVIS_BRANCH https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule init libs/assert - git submodule init libs/assert
- git submodule init libs/config - git submodule init libs/config
- git submodule init libs/core
- git submodule init libs/predef - git submodule init libs/predef
- git submodule init libs/static_assert - git submodule init libs/static_assert
- git submodule init libs/type_traits - git submodule init libs/type_traits
- git submodule init tools/build - git submodule init tools/build
- git submodule init tools/inspect - git submodule init tools/inspect
- git submodule update - git submodule update
- cd libs/core - cp -r $TRAVIS_BUILD_DIR/* libs/core
- git checkout -q $TRAVIS_COMMIT
- cd ../..
- ./bootstrap.sh - ./bootstrap.sh
- ./b2 headers - ./b2 headers
@@ -37,3 +35,7 @@ script:
- TOOLSET=gcc,clang - TOOLSET=gcc,clang
- if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi
- ./b2 libs/core/test toolset=$TOOLSET - ./b2 libs/core/test toolset=$TOOLSET
notifications:
email:
on_success: always

12
appveyor.yml
View File

@@ -12,24 +12,22 @@ branches:
- develop - develop
install: install:
- git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost - cd ..
- cd boost - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule init libs/assert - git submodule init libs/assert
- git submodule init libs/config - git submodule init libs/config
- git submodule init libs/core
- git submodule init libs/predef - git submodule init libs/predef
- git submodule init libs/static_assert - git submodule init libs/static_assert
- git submodule init libs/type_traits - git submodule init libs/type_traits
- git submodule init tools/build - git submodule init tools/build
- git submodule init tools/inspect - git submodule init tools/inspect
- git submodule update - git submodule update
- cd libs\core - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\core
- git checkout -q %APPVEYOR_REPO_COMMIT%
- cd ..\..
- bootstrap - bootstrap
- b2 headers - b2 headers
build: off build: off
test_script: test_script:
- b2 libs/core/test toolset=msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0 - b2 libs/core/test toolset=msvc-9.0,msvc-10.0,msvc-11.0,msvc-14.0

12
doc/lightweight_test.qbk
View File

@@ -32,6 +32,7 @@ When using `lightweight_test.hpp`, *do not forget* to
`` ``
#define BOOST_TEST(expression) /*unspecified*/ #define BOOST_TEST(expression) /*unspecified*/
#define BOOST_TEST_NOT(expression) /*unspecified*/
#define BOOST_ERROR(message) /*unspecified*/ #define BOOST_ERROR(message) /*unspecified*/
#define BOOST_TEST_EQ(expr1, expr2) /*unspecified*/ #define BOOST_TEST_EQ(expr1, expr2) /*unspecified*/
#define BOOST_TEST_NE(expr1, expr2) /*unspecified*/ #define BOOST_TEST_NE(expr1, expr2) /*unspecified*/
@@ -56,6 +57,17 @@ message containing `expression`.
[endsect] [endsect]
[section BOOST_TEST_NOT]
``
BOOST_TEST_NOT(expression)
``
If expression is true increases the error count and outputs a
message containing `!(expression)`.
[endsect]
[section BOOST_ERROR] [section BOOST_ERROR]
`` ``

1
include/boost/core/lightweight_test.hpp
View File

@@ -144,6 +144,7 @@ inline int report_errors()
} // namespace boost } // namespace boost
#define BOOST_TEST(expr) ((expr)? (void)0: ::boost::detail::test_failed_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION)) #define BOOST_TEST(expr) ((expr)? (void)0: ::boost::detail::test_failed_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION))
#define BOOST_TEST_NOT(expr) BOOST_TEST(!(expr))
#define BOOST_ERROR(msg) ( ::boost::detail::error_impl(msg, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) ) #define BOOST_ERROR(msg) ( ::boost::detail::error_impl(msg, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )

10
test/lightweight_test_test.cpp
View File

@@ -43,6 +43,16 @@ int main()
BOOST_TEST( x++ == 1 ); BOOST_TEST( x++ == 1 );
BOOST_TEST( x == 2? true: false ); BOOST_TEST( x == 2? true: false );
BOOST_TEST( x == 2? &x: 0 ); BOOST_TEST( x == 2? &x: 0 );
// BOOST_TEST_NOT
BOOST_TEST_NOT( x == 1 );
BOOST_TEST_NOT( ++x == 2 );
BOOST_TEST_NOT( x++ == 2 );
BOOST_TEST_NOT( --x == 2 );
BOOST_TEST_NOT( x-- == 2 );
BOOST_TEST_NOT( x == 2? false: true );
BOOST_TEST_NOT( x == 2? 0: &x );
// BOOST_TEST_EQ // BOOST_TEST_EQ