Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/filesystem…
Browse files Browse the repository at this point in the history
…_file_size
  • Loading branch information
srz-zumix committed Aug 5, 2019
2 parents 8cc9c4a + 4dba594 commit 05d137d
Show file tree
Hide file tree
Showing 12 changed files with 189 additions and 102 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -135,7 +135,7 @@ Basic test
|compiler|c++ version|status|
|:--|:--|:--|
|clang++-8|c++98/c++11/c++17|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)|
|g++-8|c++98/c++11/c++17|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)|
|g++-9|c++98/c++11/c++17|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)|
|g++-9|c++17|[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%2Fiutest_unittest?branch=master&type=cf-1)]( https://g.codefresh.io/pipelines/iutest_unittest/builds?repoOwner=srz-zumix&repoName=iutest&serviceName=srz-zumix%2Fiutest&filter=trigger:build~Build;branch:master;pipeline:58a933be9d1bd40100495882~iutest_unittest)|
|g++-8|c++17|[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%2Fiutest_unittest?branch=master&type=cf-1)]( https://g.codefresh.io/pipelines/iutest_unittest/builds?repoOwner=srz-zumix&repoName=iutest&serviceName=srz-zumix%2Fiutest&filter=trigger:build~Build;branch:master;pipeline:58a933be9d1bd40100495882~iutest_unittest)|
|g++-7|c++17|[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%2Fiutest_unittest?branch=master&type=cf-1)]( https://g.codefresh.io/pipelines/iutest_unittest/builds?repoOwner=srz-zumix&repoName=iutest&serviceName=srz-zumix%2Fiutest&filter=trigger:build~Build;branch:master;pipeline:58a933be9d1bd40100495882~iutest_unittest)|
Expand Down
145 changes: 119 additions & 26 deletions codefresh.yml
Expand Up @@ -3,7 +3,10 @@ stages:
- checkout
- build
- prepare
- test
- build_all_tests
- build_other_tests
- run_tests
- benchmark

steps:
main_clone:
Expand All @@ -12,6 +15,11 @@ steps:
stage: checkout
repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
revision: '${{CF_REVISION}}'
when:
condition:
all:
noSkipCiInCommitMessage1: 'includes(lower("${{CF_COMMIT_MESSAGE}}"), "skip ci") == false'
noSkipCiInCommitMessage2: 'includes(lower("${{CF_COMMIT_MESSAGE}}"), "ci skip") == false'
BuildingDockerImage:
title: Building Docker Image
stage: build
Expand All @@ -25,48 +33,133 @@ steps:
stage: prepare
image: gcc:9
commands:
# - cf_export GGC_MIN_EXPAND=4
# - cf_export GGC_MIN_HEAPSIZ=32768
- cf_export CI_NODEBUG=1
- make -C test clean
- make -C test prepare
RunningUnitTests:
BuildUnitTests:
type: parallel
stage: test
stage: build_all_tests
steps:
BasicTest-gcc9: &basic_test
title: Running Basic Tests - gcc9
BuildBasicTest_gcc9: &build_all_test
title: Build Basic all_tests - gcc9
image: gcc:9
environment:
- OUTDIR=gcc9
commands:
- rm -rf test/${OUTDIR} || true
- mkdir test/${OUTDIR}
- make -C test all_tests_build
BuildBasicTest_gcc8:
<<: *build_all_test
title: Build Basic all_tests - gcc8
image: gcc:8
environment:
- OUTDIR=gcc8
BuildBasicTest_gcc7:
<<: *build_all_test
title: Build Basic all_tests - gcc7
image: gcc:7
environment:
- OUTDIR=gcc7
BuildOtherUnitTests:
type: parallel
stage: build_other_tests
steps:
BuildOtherTest_gcc9: &build_other_test
image: gcc:9
environment:
- OUTDIR=gcc9
commands:
- make -C test
when:
steps:
- name: BuildBasicTest_gcc9
on:
- success
BuildOtherTest_gcc8:
<<: *build_other_test
image: gcc:8
environment:
- OUTDIR=gcc8
when:
steps:
- name: BuildBasicTest_gcc8
on:
- success
BuildOtherTest_gcc7:
<<: *build_other_test
image: gcc:7
environment:
- OUTDIR=gcc7
when:
steps:
- name: BuildBasicTest_gcc7
on:
- success
RunningAllUnitTests:
type: parallel
stage: run_tests
steps:
RunningUnitTest_gcc9: &run_test
image: gcc:9
environment:
- OUTDIR=gcc9
commands:
- make -C test test
BasicTest-gcc8:
<<: *basic_test
title: Running Basic Tests - gcc8
when:
steps:
- name: BuildOtherTest_gcc9
on:
- success
RunningUnitTest_gcc8:
<<: *run_test
image: gcc:8
environment:
- OUTDIR=gcc8
BasicTest-gcc7:
<<: *basic_test
title: Running Basic Tests - gcc7
when:
steps:
- name: BuildOtherTest_gcc8
on:
- success
RunningUnitTest_gcc7:
<<: *run_test
image: gcc:7
environment:
- OUTDIR=gcc7
BenchmarkTest:
title: Running Benchmark Tests
image: '${{BuildingDockerImage}}'
working_directory: IMAGE_WORK_DIR
entry_point:
- /bin/sh
- /codefresh/volume/cf-generated/unit_test_script
create_file:
path: /codefresh/volume/cf-generated
name: unit_test_script
content: |-
cd /codefresh/volume/iutest
cd test
make -C benchmark
make bench
when:
steps:
- name: BuildOtherTest_gcc7
on:
- success
Benchmark:
title: Running Benchmark Tests
stage: benchmark
image: '${{BuildingDockerImage}}'
working_directory: IMAGE_WORK_DIR
entry_point:
- /bin/sh
- /codefresh/volume/cf-generated/unit_test_script
create_file:
path: /codefresh/volume/cf-generated
name: unit_test_script
content: |-
cd /codefresh/volume/iutest
cd test
make -C benchmark
make bench
when:
steps:
- name: RunningUnitTest_gcc9
on:
- success
- name: RunningUnitTest_gcc8
on:
- success
- name: RunningUnitTest_gcc7
on:
- success
on_success:
metadata:
set:
Expand Down
2 changes: 1 addition & 1 deletion docs/Doxyfile
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = iutest
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.16.99.23
PROJECT_NUMBER = 1.16.99.24

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
1 change: 1 addition & 0 deletions include/internal/iutest_option_message.hpp
Expand Up @@ -193,6 +193,7 @@ inline void iuOptionMessage::ShowSpec()
IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_RANDOM);
IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_REGEX);
IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_STRING_VIEW);
IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_TYPE_TARITS);
IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_VARIANT);
IIUT_SHOW_MACRO(IUTEST_HAS_CXX11);
IIUT_SHOW_MACRO(IUTEST_HAS_CXX14);
Expand Down
16 changes: 8 additions & 8 deletions include/internal/iutest_type_traits.hpp
Expand Up @@ -21,22 +21,22 @@

//======================================================================
// define
#ifndef IUTEST_HAS_HDR_TYPETARITS
#ifndef IUTEST_HAS_CXX_HDR_TYPE_TARITS
# if defined(__has_include)
# if __has_include( <type_traits> ) && IUTEST_HAS_CXX11
# define IUTEST_HAS_HDR_TYPETARITS 1
# define IUTEST_HAS_CXX_HDR_TYPE_TARITS 1
# endif
# elif (defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)) && IUTEST_HAS_CXX11
# define IUTEST_HAS_HDR_TYPETARITS 1
# define IUTEST_HAS_CXX_HDR_TYPE_TARITS 1
# elif defined(_MSC_VER)
# if _MSC_VER >= 1600
# define IUTEST_HAS_HDR_TYPETARITS 1
# define IUTEST_HAS_CXX_HDR_TYPE_TARITS 1
# endif
# endif
#endif

#ifndef IUTEST_HAS_HDR_TYPETARITS
# define IUTEST_HAS_HDR_TYPETARITS 0
#ifndef IUTEST_HAS_CXX_HDR_TYPE_TARITS
# define IUTEST_HAS_CXX_HDR_TYPE_TARITS 0
#endif

#ifndef IUTEST_HAS_RVALUE_REFS
Expand All @@ -51,7 +51,7 @@
# define IUTEST_HAS_RVALUE_REFS 0
#endif

#if IUTEST_HAS_HDR_TYPETARITS
#if IUTEST_HAS_CXX_HDR_TYPE_TARITS
# include <type_traits>
#else
# if !defined(IUTEST_USE_OWN_IS_MEMBER_FUNCTION_POINTER)
Expand Down Expand Up @@ -152,7 +152,7 @@ template<typename T>struct is_member_function_pointer;

#endif

#if IUTEST_HAS_HDR_TYPETARITS
#if IUTEST_HAS_CXX_HDR_TYPE_TARITS

using ::std::true_type;
using ::std::false_type;
Expand Down
2 changes: 1 addition & 1 deletion include/iutest_assertion.hpp
Expand Up @@ -832,7 +832,7 @@ class NeHelper<true>

} // end of namespace backward

#if IUTEST_HAS_NULLPTR && IUTEST_HAS_HDR_TYPETARITS && 0
#if IUTEST_HAS_NULLPTR && IUTEST_HAS_CXX_HDR_TYPE_TARITS && 0

/**
* @brief Equal Helper
Expand Down
3 changes: 2 additions & 1 deletion include/iutest_printers.hpp
Expand Up @@ -304,7 +304,8 @@ inline void PrintTo(const wchar_t value, iu_ostream* os)
}
else
{
*os << "\'" << value << "\'";
const wchar_t str[2] = { value, L'\0' };
*os << "\'" << detail::ShowWideCString(str) << "\'";
}
}
inline void PrintTo(const unsigned char value, iu_ostream* os)
Expand Down
4 changes: 2 additions & 2 deletions include/iutest_ver.hpp
Expand Up @@ -17,11 +17,11 @@

//======================================================================
// define
#define IUTEST_VER 0x01169923u //!< iutest version 1.16.99.23
#define IUTEST_VER 0x01169924u //!< iutest version 1.16.99.24
#define IUTEST_MAJORVER 0x01u //!< Major Version
#define IUTEST_MINORVER 0x16u //!< Minor Version
#define IUTEST_MICROVER 0x99u //!< Micro Version
#define IUTEST_REVISION 0x23u //!< Revision
#define IUTEST_REVISION 0x24u //!< Revision

#define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated

Expand Down

0 comments on commit 05d137d

Please sign in to comment.