• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1417 (tree)
Zeit2020-07-09 10:12:00
Autorsrz_zumix

Log Message

drone matrix (#483)

* drone matrix

* cd test

* fix workdir

* matrix

* fix report

* fix shellcheck

* include climits

* fix cxx

* fix version detect

* add clang and cpp03 pipeline

* fix

* fail first

* fail test

* pipefail

* up

* fix error

* update

* rm old clang

* tag matrix

* tag matrix

* split pipeline

* split 2.9

* fix split

* fix 2

* cxx matrix

* rename

* j1

* split pipeline and sequential

* set

* up

* no fs

* change image

* fix clang version

* seq

* clangbuiltlinux/debian

* fix clang

* fix env

* update name

* fix stdflag

* fix typo

* tes

* test

* fix

* clang only

* fix for old clang

* fix typo

* fix condition

* fix null-conversion

* test

* fix

* rm bom

* test

* fix ss

* fix

* update

* fix signed wchar_t

* fix

* mtx

* seq

* old gcc

* clang03

* 98

* curl

* install curl

* apt-get update &&

* fix variadic tuple condition
git@bc536a314fc8b313132bbd10a58ea82dbfaa85ce
https://github.com/srz-zumix/iutest/commit/bc536a314fc8b313132bbd10a58ea82dbfaa85ce


Wercker change ci (#482)

git@81fbd9dc7760f0b8f44ccf47e7fc8037dbe780e2


wandbox to basic test (#481)

* wandbox to basic test

* update

* clean [ci skip]

* clean [ci skip]
git@8018d69262b8e0a396126da96b8e20bc972de28a


razorops regex test (#478)

git@198ee95ffd690d132668696e6767d93db4b26df7


cirrus filter

git@238b7e5a45e3f4667687ee057518cd24ac0d2c97


Merge pull request #480 from srz-zumix/feature/azp_pr_path_filter

[Azure Pipelines] pr path filter
git@b8e578e24c6aa36161fc2b8ca26e1f60c44a0eaf


pr path filter

git@fb0d1a02893dbe8eb41b0018239858c5106e7509


fix path

git@df3da5b23ac848e1e9922f40a1db290c61253fe4


fix

git@4e20c831afa642ab0111575a6268ec67297fc01a


root

git@9139a28d4ff423e058f9e81372a67ac2359fd744


gcc3 test

git@b246999222b3802c918249400be88f086267b57c


fix

git@5f4802fd717645c81a8d10c59c21cbbec66cc852


fix

git@fd00b7460c9820d9b4d62e2b42693da2e834184d


root

git@483a6496b577b94d0a7ce00d4c17d8b5d4933324


root

git@aa6a376edcd3b16bc2d7f9c02970d70381a9d4a4


mkdir

git@b915d3b8fedd622cfb6e6ba7aeb8234ecb18bb1f


ls -l

git@d5f1e2c84b75be701859f9363864aca31fc7bb2b


test

git@a006fecbc00d9d7eb68f151d3cf9e34d9098ab05


ls

git@60cbbcc5a29566511c12bdae5ad5af5aaf84b285


test

git@ecf7a70260b0a88eb588161719f6d297341c7a75


cd

git@0ed6deb2b1ebf6f29ca432f0b84176412be335f2


build image test

git@10c2a8a4eb9ca6a9c426a0bdbbd5a33950779c25


rename

git@b0eb34542d37290eb1e79f9771b368f75df95201


prev

git@9fefcd790042fb11bd0c2e4663903a69c1c4152b


test

git@4e7e2e9cba3a7a5a31f843fe3fcec075268b1955


fix

git@506354895f93311d43aee3462764a30713947c71


cp

git@3ac81da56e9960584765a84d5df9a5136c690eeb


fix clean

git@bb244a47dcf4f67129c607558e4a7627307baa4e


clean

git@4d2537df8666d89bc3571073b28a088398698f35


test

git@5f6cd8a79586fc9aeff7af1858221f4b15a17984


test

git@d65979d73822fa64a6aae66bd42af0f876e7e409


echo test

git@f72765935a68b78f0ac2e042351891f808dbedd9


gcc

git@72679863ecb315ef7319d86a63840dbcf5ddb378


sudo

git@4a1d815b9ebd478d41c66cf93bfabbc537a805c4


rm -j

git@cbe5992bd16bb6e85dfd31c41979c05a7a5c5fef


test

git@aa65a4afe4a3a24a1f6b62daa70377e309924576


new step

git@e28e6f1e01f6baff1fdbdaa26bb28e7fb2d3b8d9


echo test

git@9f2431af6478a788c72b353ad12700bc715f9c76


rename

git@a8138ab72c1a6aa1a0bc78c97d2a87f473374504


test

git@935933a2af91f81193260b99e9ff7578ee5a2b82


razorops regex test

git@88c427117fa5f07ceecabba726dc084e2aa7099a


v1.17.0.11

git@85546765a68844a0df49a8a0767af345e3ccf904


Merge pull request #476 from srz-zumix/bitrise/support_fork_pr

Bitrise: git remote rm fork
git@02eb9991e52a964542f3667dacc8221189e0a194


rm fork

git@926709f6acb3eb41bdad8ada814990806060cbd2


Merge remote-tracking branch 'origin/master' into develop

git@04daa34d485d43bad2cd1d088202fb8ef0785259


update ci yaml (#472)

* update cirrus

* update github actions

* update drone

* azp test

* fix azp

* update shippable

* update coverity scan

* update cov scan

* update travis

* fix shippable
git@6d1b140f5a99a93ceddd40bbd7b2ff7f534015ca


add azurepipelines path filter

git@fcc780b20c3e9c968fc7467e61bfa072a3e4d1cf


update name (#471)

* update name

* [ci skip]
git@f9ad41853a1c80a775fcca3e055eb0175c0ec117


config perf

git@7c0a37dd2612824489ca22082e6feda875a117f6


add linux tools

git@af9721df67fecb327dddcfca44e0c78fdd80c532


add cmake

git@005878acd145eeb15faef8632faa57115cfcfc87


Merge pull request #470 from srz-zumix/drone/depends_on

add latest test depends_on
git@29bbb95275c4be0a1a7d8dea0a03ee9f9f0d6be9


add latest test depends_on

git@36f9441400271ac9a74686303b4c4d26c51e587c

Ändern Zusammenfassung

Diff

--- trunk/.travis.yml (revision 1416)
+++ trunk/.travis.yml (revision 1417)
@@ -80,13 +80,24 @@
8080 - if [ "${USE_GMOCK}" = '1' ]; then . .ci/travisci/install-gmock.sh; fi
8181
8282 script:
83- - if [ "${USE_LIB}" = '1' ]; then cd projects/make && make && cd -; fi
84- - if [ "${USE_CMAKE}" = '1' ]; then
85- mkdir ./cmake-build && cd ./cmake-build && cmake ../projects/cmake && cmake --build . && ctest -C Debug -V && cd ..;
83+ - |
84+ if [ "${USE_LIB}" = '1' ]; then
85+ cd projects/make && make && cd -
8686 fi
87+ - |
88+ if [ "${USE_CMAKE}" = '1' ]; then
89+ mkdir ./cmake-build &&
90+ cd ./cmake-build &&
91+ cmake ../projects/cmake &&
92+ cmake --build . &&
93+ ctest -C Debug -V &&
94+ cd ..
95+ fi
8796 - cd ./test
88- - if [ "${COVERITY_SCAN}" != '1' ] && [ "${USE_CMAKE}" != '1' ]; then
89- make -j4 showcxxversion ${USE_FUSED} default && make test ${USE_FUSED};
97+ - |
98+ if [ "${COVERITY_SCAN}" != '1' ] && [ "${USE_CMAKE}" != '1' ]; then
99+ make -j4 showcxxversion ${USE_FUSED} default &&
100+ make test ${USE_FUSED}
90101 fi
91102 - |
92103 if [ "${COVERITY_SCAN}" = '1' ] && [ -d cov-int ]; then
@@ -246,7 +257,9 @@
246257 name: "srz-zumix/iutest"
247258 description: "iutest c++ testing framework"
248259 notification_email: zumix.cpp@gmail.com
249- build_command_prepend: "cov-configure --comptype gcc --compiler gcc-7 --template && cd ./test"
260+ build_command_prepend: >
261+ cov-configure --comptype gcc --compiler gcc-7 --template &&
262+ cd ./test
250263 build_command: make -j4 coverity_scan STDFLAG=-std=c++17
251264 branch_pattern: master|.*coverity_scan.*
252265 # Sanitize
--- trunk/README.md (revision 1416)
+++ trunk/README.md (revision 1417)
@@ -132,19 +132,19 @@
132132 |[Codefresh](https://codefresh.io/)|[![Codefresh build status](https://g.codefresh.io/api/badges/pipeline/srz-zumix/iutest%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)|[![Codefresh build status](https://g.codefresh.io/api/badges/pipeline/srz-zumix/iutest%2Fiutest_unittest?branch=develop&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:develop;pipeline:58a933be9d1bd40100495882~iutest_unittest)|Build tools/docker/Dockerfile, Benchmark test, Gcc 8/9 basic test|
133133 |[Codeship](https://codeship.com/)|[![Codeship Status for srz-zumix/iutest](https://app.codeship.com/projects/5bc87030-5b41-0133-6000-4242aa07dce3/status?branch=master)](https://app.codeship.com/projects/110695)|[![Codeship Status for srz-zumix/iutest](https://app.codeship.com/projects/5bc87030-5b41-0133-6000-4242aa07dce3/status?branch=develop)](https://app.codeship.com/projects/110695)|Check coding standard of the project|
134134 |[Coverity Scan](https://scan.coverity.com)|[![Coverity Scan Build Status](https://scan.coverity.com/projects/1316/badge.svg)](https://scan.coverity.com/projects/srz-zumix-iutest)||Coverity Scan|
135-|[Drone Cloud](https://cloud.drone.io)|[![Drone Build Status](https://cloud.drone.io/api/badges/srz-zumix/iutest/status.svg?branch=master)](https://cloud.drone.io/srz-zumix/iutest)|[![Build Status](https://cloud.drone.io/api/badges/srz-zumix/iutest/status.svg?branch=develop)](https://cloud.drone.io/srz-zumix/iutest)|gtest compatible test for released versions / gtest version detect test|
135+|[Drone Cloud](https://cloud.drone.io)|[![Drone Build Status](https://cloud.drone.io/api/badges/srz-zumix/iutest/status.svg?branch=master)](https://cloud.drone.io/srz-zumix/iutest)|[![Build Status](https://cloud.drone.io/api/badges/srz-zumix/iutest/status.svg?branch=develop)](https://cloud.drone.io/srz-zumix/iutest)|gcc/clang each version Basic test|
136136 |[GitHub Actions](https://github.com/srz-zumix/iutest/actions?query=workflow%3A"GitHub+Actions")|[![GitHub Actions Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions/badge.svg?branch=master)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions%22+branch%3Amaster)|[![GitHub Actions Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions%22+branch%3Adevelop)|Basic test (Windows LLVM clang and mingw), EditorConfig Lint, Include What You Use, arm-none-eabi-gcc build|
137137 |[GitHub Actions reviewdog](https://github.com/srz-zumix/iutest/actions?query=workflow%3A"GitHub+Actions+reviewdog")|[![GitHub Actions Reviewdog Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions%20-%20reviewdog/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions+-+reviewdog%22+branch%3Amaster)||Reviewdog (shellcheck, cpplint)|
138138 |[GitHub Actions Update GitHubPages](https://github.com/srz-zumix/iutest/actions?query=workflow%3A"GitHubPages")|[![Update GitHubPages Status](https://github.com/srz-zumix/iutest/workflows/GitHubPages/badge.svg?branch=master)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHubPages%22+branch%3Amaster)||Update documents|
139139 |[GitLab CI](https://about.gitlab.com/product/continuous-integration/)|[![GitLab CI pipeline status](https://gitlab.com/srz-zumix/iutest-test/badges/master/pipeline.svg)](https://gitlab.com/srz-zumix/iutest-test/commits/master)|[![GitLab CI pipeline status](https://gitlab.com/srz-zumix/iutest-test/badges/develop/pipeline.svg)](https://gitlab.com/srz-zumix/iutest-test/commits/develop)|Google Test/Google Mock compatibility (HEAD)|
140140 |[Peakflow](https://www.peakflow.io)|[![Peakflow Build Status](https://www.peakflow.io/en/projects/iutest/branch-statuses/master.svg)](https://www.peakflow.io/en/projects/iutest/build-groups?build_groups_q%5Bbranch_name_cont%5D=master)|[![Peakflow Build Status](https://www.peakflow.io/en/projects/iutest/branch-statuses/develop.svg)](https://www.peakflow.io/en/projects/iutest/build-groups?build_groups_q%5Bbranch_name_cont%5D=develop)||
141-|[Razorops](https://razorops.com/)|-|-|CentOS/gcc3.4.6 Basic test|
141+|[Razorops](https://razorops.com/)|-|-|CentOS7 Basic test|
142142 |[Scrutinizer](https://scrutinizer-ci.com/)|[![Scrutinizer Build Status](https://scrutinizer-ci.com/g/srz-zumix/iutest/badges/build.png?b=master)](https://scrutinizer-ci.com/g/srz-zumix/iutest/build-status/master)|[![Scrutinizer Build Status](https://scrutinizer-ci.com/g/srz-zumix/iutest/badges/build.png?b=develop)](https://scrutinizer-ci.com/g/srz-zumix/iutest/build-status/develop)|iuwandbox tests|
143143 |[Semaphore](https://semaphoreci.com/)|[![Semaphore Build Status](https://semaphoreci.com/api/v1/srz_zumix/iutest/branches/master/badge.svg)](https://semaphoreci.com/srz_zumix/iutest)|[![Semaphore Build Status](https://semaphoreci.com/api/v1/srz_zumix/iutest/branches/develop/badge.svg)](https://semaphoreci.com/srz_zumix/iutest)|Scan-build|
144144 |[Semaphore 2.0](https://semaphoreci.com/)|[![Semaphore 2.0 Build Status](https://srz-zumix.semaphoreci.com/badges/iutest/branches/master.svg)](https://srz-zumix.semaphoreci.com/projects/iutest)|[![Semaphore 2.0 Build Status](https://srz-zumix.semaphoreci.com/badges/iutest/branches/develop.svg)](https://srz-zumix.semaphoreci.com/projects/iutest)|Scan-build, Basic test, sample run|
145-|[Shippable](https://shippable.com/)|[![Shippable Run Status](https://api.shippable.com/projects/541904d2ac22859af743f867/badge?branch=master)](https://app.shippable.com/github/srz-zumix/iutest)|[![Run Status](https://api.shippable.com/projects/541904d2ac22859af743f867/badge?branch=develop)](https://app.shippable.com/github/srz-zumix/iutest)|Syntax tests for compiler each version (c++98)|
145+|[Shippable](https://shippable.com/)|[![Shippable Run Status](https://api.shippable.com/projects/541904d2ac22859af743f867/badge?branch=master)](https://app.shippable.com/github/srz-zumix/iutest)|[![Run Status](https://api.shippable.com/projects/541904d2ac22859af743f867/badge?branch=develop)](https://app.shippable.com/github/srz-zumix/iutest)|CentOS gcc/clang Baisc test|
146146 |[Travis CI](https://travis-ci.com/)|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=develop)](https://travis-ci.com/srz-zumix/iutest)|Basic tests, Google Test compatibility, Coverage, Coverity-scan|
147-|[Wercker](https://www.wercker.com/)|[![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/master "wercker status")](https://app.wercker.com/project/byKey/d385156052aa4118a7f24affe4a8f851)|[![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/develop "wercker status")](https://app.wercker.com/project/byKey/d385156052aa4118a7f24affe4a8f851)|Syntax tests for compiler each version (c++latest)|
147+|[Wercker](https://www.wercker.com/)|[![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/master "wercker status")](https://app.wercker.com/project/byKey/d385156052aa4118a7f24affe4a8f851)|[![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/develop "wercker status")](https://app.wercker.com/project/byKey/d385156052aa4118a7f24affe4a8f851)|gtest compatible test for released versions / gtest version detect test|
148148
149149 Basic test
150150
--- trunk/azure-pipelines.yml (revision 1416)
+++ trunk/azure-pipelines.yml (revision 1417)
@@ -14,7 +14,9 @@
1414 - .editorconfig
1515 - .hadolint.yaml
1616 - .lgtm.yaml
17- - tox.ini
17+ - .git*
18+ - "*.ini"
19+ - "*.wsf"
1820 - appveyor.yml
1921 - bitrise.yml
2022 - buddy.yml
@@ -36,13 +38,43 @@
3638
3739 pr:
3840 branches:
41+ # base branch name filter
3942 include:
4043 - master
4144 - develop
4245 - azure-pipelines/*
4346 - azurepipelines/*
44- - feature/*
45- - fix/*
47+ paths:
48+ exclude:
49+ - "*.md"
50+ - docs/*
51+ - Jenkinsfile
52+ - LICENSE
53+ - .bandit
54+ - .editorconfig
55+ - .hadolint.yaml
56+ - .lgtm.yaml
57+ - .git*
58+ - "*.ini"
59+ - "*.wsf"
60+ - appveyor.yml
61+ - bitrise.yml
62+ - buddy.yml
63+ - .circleci/*
64+ - .cirrus.yml
65+ - .scrutinizer.yml
66+ - codecov.yml
67+ - codefresh.yml
68+ - codeship-services.yml
69+ - codeship-steps.yml
70+ - .drone.yml
71+ - .github/*
72+ - .razorops.yaml
73+ - .semaphore/*
74+ - shippable.yml
75+ - sider.yml
76+ - .travis.yml
77+ - wercker.yml
4678
4779 stages:
4880 - stage: Precheck
--- trunk/bitrise.yml (revision 1416)
+++ trunk/bitrise.yml (revision 1417)
@@ -28,6 +28,7 @@
2828 - content: |-
2929 #!/bin/bash
3030 set -ex
31+ git remote rm fork || true
3132 bitrise run ${BITRISE_APP_TITLE}-${BITRISE_TRIGGERED_WORKFLOW_ID}
3233 iutest-ci:
3334 after_run:
--- trunk/codefresh.yml (revision 1416)
+++ trunk/codefresh.yml (revision 1417)
@@ -3,8 +3,8 @@
33 - checkout
44 - build
55 - prepare
6- - build_all_tests
7- - build_other_tests
6+ - build_all_unit_tests
7+ - build_other_unit_tests
88 - run_tests
99 - benchmark
1010
@@ -40,12 +40,12 @@
4040 - make -C test clean
4141 - make -C test prepare
4242 when: *skip_condition
43- BuildUnitTests:
43+ BuildAllUnitTests:
4444 type: parallel
45- stage: build_all_tests
45+ stage: build_all_unit_tests
4646 when: *skip_condition
4747 steps:
48- BuildBasicTest_gcc9: &build_all_test
48+ BuildAllUnitTest_gcc9: &build_all_unit_test
4949 title: Build Basic all_tests - gcc9
5050 image: gcc:9
5151 environment:
@@ -54,14 +54,14 @@
5454 - rm -rf test/${OUTDIR} || true
5555 - mkdir test/${OUTDIR}
5656 - make -C test all_tests_build
57- BuildBasicTest_gcc8:
58- <<: *build_all_test
57+ BuildAllUnitTest_gcc8:
58+ <<: *build_all_unit_test
5959 title: Build Basic all_tests - gcc8
6060 image: gcc:8
6161 environment:
6262 - OUTDIR=gcc8
63- # BuildBasicTest_gcc7:
64- # <<: *build_all_test
63+ # BuildAllUnitTest_gcc7:
64+ # <<: *build_all_unit_test
6565 # title: Build Basic all_tests - gcc7
6666 # image: gcc:7
6767 # environment:
@@ -68,9 +68,9 @@
6868 # - OUTDIR=gcc7
6969 BuildOtherUnitTests:
7070 type: parallel
71- stage: build_other_tests
71+ stage: build_other_unit_tests
7272 steps:
73- BuildOtherTest_gcc9: &build_other_test
73+ BuildOtherUnitTest_gcc9: &build_other_unit_tests
7474 image: gcc:9
7575 environment:
7676 - OUTDIR=gcc9
@@ -78,34 +78,34 @@
7878 - make -C test
7979 when:
8080 steps:
81- - name: BuildBasicTest_gcc9
81+ - name: BuildAllUnitTest_gcc9
8282 on:
8383 - success
84- BuildOtherTest_gcc8:
85- <<: *build_other_test
84+ BuildOtherUnitTest_gcc8:
85+ <<: *build_other_unit_tests
8686 image: gcc:8
8787 environment:
8888 - OUTDIR=gcc8
8989 when:
9090 steps:
91- - name: BuildBasicTest_gcc8
91+ - name: BuildAllUnitTest_gcc8
9292 on:
9393 - success
94- # BuildOtherTest_gcc7:
95- # <<: *build_other_test
94+ # BuildOtherUnitTest_gcc7:
95+ # <<: *build_other_unit_tests
9696 # image: gcc:7
9797 # environment:
9898 # - OUTDIR=gcc7
9999 # when:
100100 # steps:
101- # - name: BuildBasicTest_gcc7
101+ # - name: BuildAllUnitTest_gcc7
102102 # on:
103103 # - success
104- RunningAllUnitTests:
104+ RunTests:
105105 type: parallel
106106 stage: run_tests
107107 steps:
108- RunningUnitTest_gcc9: &run_test
108+ RunTest_gcc9: &run_test
109109 image: gcc:9
110110 environment:
111111 - OUTDIR=gcc9
@@ -113,10 +113,10 @@
113113 - make -C test test
114114 when:
115115 steps:
116- - name: BuildOtherTest_gcc9
116+ - name: BuildOtherUnitTest_gcc9
117117 on:
118118 - success
119- RunningUnitTest_gcc8:
119+ RunTest_gcc8:
120120 <<: *run_test
121121 image: gcc:8
122122 environment:
@@ -123,10 +123,10 @@
123123 - OUTDIR=gcc8
124124 when:
125125 steps:
126- - name: BuildOtherTest_gcc8
126+ - name: BuildOtherUnitTest_gcc8
127127 on:
128128 - success
129- # RunningUnitTest_gcc7:
129+ # RunTest_gcc7:
130130 # <<: *run_test
131131 # image: gcc:7
132132 # environment:
@@ -133,7 +133,7 @@
133133 # - OUTDIR=gcc7
134134 # when:
135135 # steps:
136- # - name: BuildOtherTest_gcc7
136+ # - name: BuildOtherUnitTest_gcc7
137137 # on:
138138 # - success
139139 Benchmark:
--- trunk/include/internal/iutest_compiler.hpp (revision 1416)
+++ trunk/include/internal/iutest_compiler.hpp (revision 1417)
@@ -153,6 +153,9 @@
153153 # if __has_feature(cxx_nullptr)
154154 # define IUTEST_HAS_NULLPTR 1
155155 # endif
156+# if (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 2))
157+# define IUTEST_NO_NULL_TO_NULLPTR_T 1 // -Wnull-conversion
158+# endif
156159 # elif defined(__GNUC__)
157160 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
158161 # define IUTEST_HAS_NULLPTR 1
--- trunk/include/internal/iutest_internal_defs.hpp (revision 1416)
+++ trunk/include/internal/iutest_internal_defs.hpp (revision 1417)
@@ -122,7 +122,7 @@
122122
123123 //======================================================================
124124 // types
125-#if IUTEST_HAS_NULLPTR
125+#if IUTEST_HAS_NULLPTR && !defined(IUTEST_NO_NULL_TO_NULLPTR_T)
126126 typedef ::std::nullptr_t iu_nullptr_convertible_t;
127127 #else
128128 typedef ::iutest_compatible::IsNullLiteralHelper::Object* iu_nullptr_convertible_t;
--- trunk/include/internal/iutest_option_message.hpp (revision 1416)
+++ trunk/include/internal/iutest_option_message.hpp (revision 1417)
@@ -246,6 +246,7 @@
246246 IIUT_SHOW_MACRO(IUTEST_HAS_TUPLE);
247247 IIUT_SHOW_MACRO(IUTEST_HAS_VARIADIC_TEMPLATES);
248248 IIUT_SHOW_MACRO(IUTEST_HAS_VARIADIC_TEMPLATE_TEMPLATES);
249+ IIUT_SHOW_MACRO(IUTEST_HAS_VARIADIC_TUPLES);
249250 IIUT_SHOW_MACRO(IUTEST_HAS_WANT_SECURE_LIB);
250251 IIUT_SHOW_MACRO(IUTEST_USE_OWN_LIST);
251252 IIUT_SHOW_MACRO(IUTEST_USE_OWN_STRING_VIEW);
--- trunk/include/internal/iutest_stdlib.hpp (revision 1416)
+++ trunk/include/internal/iutest_stdlib.hpp (revision 1417)
@@ -537,7 +537,20 @@
537537 # endif
538538 # define IUTEST_HAS_TUPLE 0
539539 #endif
540+#if !defined(IUTEST_HAS_VARIADIC_TUPLES) && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_TUPLE && IUTEST_HAS_STD_TUPLE
541+# if defined(__clang__)
542+# if (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ > 7))
543+# define IUTEST_HAS_VARIADIC_TUPLES 1
544+# endif
545+# else
546+# define IUTEST_HAS_VARIADIC_TUPLES 1
547+# endif
548+#endif
549+#if !defined(IUTEST_HAS_VARIADIC_TUPLES)
550+# define IUTEST_HAS_VARIADIC_TUPLES 0
551+#endif
540552
553+
541554 //======================================================================
542555 // declare
543556
--- trunk/include/internal/iutest_string_view.hpp (revision 1416)
+++ trunk/include/internal/iutest_string_view.hpp (revision 1417)
@@ -24,6 +24,7 @@
2424 #if IUTEST_HAS_EXCEPTIONS
2525 # include <stdexcept>
2626 #endif
27+#include <climits>
2728
2829 namespace iutest {
2930 namespace detail
--- trunk/include/iutest_config.hpp (revision 1416)
+++ trunk/include/iutest_config.hpp (revision 1417)
@@ -218,7 +218,7 @@
218218
219219 #if !defined(IUTEST_HAS_VARIADIC_VALUES)
220220 //! 可変長引数に対応した ::iutest::Values が使用可能かどうか
221-# if IUTEST_HAS_PARAM_TEST && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_TUPLE
221+# if IUTEST_HAS_PARAM_TEST && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_VARIADIC_TUPLES
222222 # define IUTEST_HAS_VARIADIC_VALUES 1
223223 # else
224224 # define IUTEST_HAS_VARIADIC_VALUES 0
@@ -227,7 +227,7 @@
227227
228228 #if !defined(IUTEST_HAS_VARIADIC_COMBINE)
229229 //! 可変長引数に対応した ::iutest::Combine が使用可能かどうか
230-# if IUTEST_HAS_COMBINE && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_STD_TUPLE
230+# if IUTEST_HAS_COMBINE && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_VARIADIC_TUPLES
231231 # define IUTEST_HAS_VARIADIC_COMBINE 1
232232 # else
233233 # define IUTEST_HAS_VARIADIC_COMBINE 0
@@ -236,7 +236,7 @@
236236
237237 #if !defined(IUTEST_HAS_VARIADIC_PAIRWISE)
238238 //! 可変長引数に対応した ::iutest::Pairwise が使用可能かどうか
239-# if IUTEST_HAS_PAIRWISE && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_STD_TUPLE
239+# if IUTEST_HAS_PAIRWISE && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_VARIADIC_TUPLES
240240 # define IUTEST_HAS_VARIADIC_PAIRWISE 1
241241 # else
242242 # define IUTEST_HAS_VARIADIC_PAIRWISE 0
--- trunk/include/iutest_ver.hpp (revision 1416)
+++ trunk/include/iutest_ver.hpp (revision 1417)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01170010u //!< iutest version 1.17.0.10
20+#define IUTEST_VER 0x01170011u //!< iutest version 1.17.0.11
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x17u //!< Minor Version
2323 #define IUTEST_MICROVER 0x00u //!< Micro Version
24-#define IUTEST_REVISION 0x10u //!< Revision
24+#define IUTEST_REVISION 0x11u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
--- trunk/shippable.yml (revision 1416)
+++ trunk/shippable.yml (revision 1417)
@@ -1,8 +1,7 @@
1-# shippable test c++98 compile...
2-
3-language: python
4-
5-python: 3.7
1+language: c
2+compiler:
3+ - gcc
4+ - clang
65 cache: true
76 parallelized_test: true
87
@@ -16,77 +15,11 @@
1615
1716 build:
1817 ci:
19-# - sudo apt-get update && sudo apt-get install --only-upgrade openssl libssl-dev
20-# - pip install -i https://pypi.python.org/simple/ --upgrade pip
21-# - pip --version
22- - pip install requests # || cat /home/shippable/.pip/pip.log
23- - export PYTHONDONTWRITEBYTECODE=1
24- - make -C tools/fused
25- - mkdir -p shippable/testresults
26- - cd tools/wandbox
27- - python ./iuwandbox.py --list-options ${WANDBOX_COMPILER}
28- - export IUWANDBOX_COMMANDLINE_OPTION="../../test/syntax_tests.cpp -f"-DIUTEST_USE_MAIN=1" -f"-Werror" --boost nothing --encoding utf-8-sig --expand-include --verbose --check-config"
29- - python ./iuwandbox.py --iutest-use-wandbox-min ${IUWANDBOX_COMMANDLINE_OPTION} ${IUWANDBOX_ADD_OPTION} --std "c++98" --junit ../../shippable/testresults/test_result.xml
30- - python ./iuwandbox.py --iutest-use-wandbox-min ${IUWANDBOX_COMMANDLINE_OPTION} ${IUWANDBOX_ADD_OPTION} --std "gnu++98" --junit ../../shippable/testresults/test_result_gnu.xml
31- on_success:
32- - echo OK
18+ - cd test
19+ - make showcxxversion
20+ - make -j2
21+ - make test
3322
34-env:
35- matrix:
36- - WANDBOX_COMPILER=gcc-head
37- - WANDBOX_COMPILER=gcc-10.1.0
38- - WANDBOX_COMPILER=gcc-9.3.0
39- # - WANDBOX_COMPILER=gcc-9.2.0
40- # - WANDBOX_COMPILER=gcc-9.1.0
41- - WANDBOX_COMPILER=gcc-8.3.0
42- # - WANDBOX_COMPILER=gcc-8.2.0
43-# - WANDBOX_COMPILER=gcc-8.1.0
44- - WANDBOX_COMPILER=gcc-7.3.0
45-# - WANDBOX_COMPILER=gcc-7.2.0
46-# - WANDBOX_COMPILER=gcc-7.1.0
47- - WANDBOX_COMPILER=gcc-6.3.0
48-# - WANDBOX_COMPILER=gcc-6.2.0
49-# - WANDBOX_COMPILER=gcc-6.1.0
50- - WANDBOX_COMPILER=gcc-5.5.0
51-# - WANDBOX_COMPILER=gcc-5.4.0
52-# - WANDBOX_COMPILER=gcc-5.3.0
53-# - WANDBOX_COMPILER=gcc-5.2.0
54-# - WANDBOX_COMPILER=gcc-5.1.0
55- - WANDBOX_COMPILER=gcc-4.9.3
56-# - WANDBOX_COMPILER=gcc-4.9.2
57-# - WANDBOX_COMPILER=gcc-4.9.1
58-# - WANDBOX_COMPILER=gcc-4.9.0
59- - WANDBOX_COMPILER=gcc-4.8.5
60-# - WANDBOX_COMPILER=gcc-4.8.4
61-# - WANDBOX_COMPILER=gcc-4.8.3
62-# - WANDBOX_COMPILER=gcc-4.8.2
63-# - WANDBOX_COMPILER=gcc-4.8.1
64- - WANDBOX_COMPILER=gcc-4.7.4
65-# - WANDBOX_COMPILER=gcc-4.7.3
66- - WANDBOX_COMPILER=gcc-4.6.4
67- - WANDBOX_COMPILER=gcc-4.5.4
68- - WANDBOX_COMPILER=gcc-4.4.7
69- - WANDBOX_COMPILER=clang-head IUWANDBOX_ADD_OPTION=-f"-Wno-c++11-inline-namespace"
70- - WANDBOX_COMPILER=clang-10.0.0
71- - WANDBOX_COMPILER=clang-9.0.0
72- - WANDBOX_COMPILER=clang-8.0.0
73- - WANDBOX_COMPILER=clang-7.0.0
74- - WANDBOX_COMPILER=clang-6.0.1
75-# - WANDBOX_COMPILER=clang-6.0.0
76- - WANDBOX_COMPILER=clang-5.0.0
77- - WANDBOX_COMPILER=clang-4.0.1
78- - WANDBOX_COMPILER=clang-4.0.0
79- - WANDBOX_COMPILER=clang-3.9.1
80- - WANDBOX_COMPILER=clang-3.8.1
81- - WANDBOX_COMPILER=clang-3.7.1
82- - WANDBOX_COMPILER=clang-3.6.0
83- - WANDBOX_COMPILER=clang-3.5.0
84-# - WANDBOX_COMPILER=clang-3.4
85-# - WANDBOX_COMPILER=clang-3.3
86-# - WANDBOX_COMPILER=clang-3.2
87-# - WANDBOX_COMPILER=clang-3.1
88- - WANDBOX_COMPILER=zapcc-1.0.1
89-
9023 integrations:
9124 notifications:
9225 - integrationName: email
--- trunk/test/printers_tests.cpp (revision 1416)
+++ trunk/test/printers_tests.cpp (revision 1417)
@@ -269,8 +269,9 @@
269269 const ::std::string s = ::iutest::PrintToString(p);
270270 if( s[0] == '0' )
271271 {
272- LogChecker ck("00020BB7000091CE00005BB6");
273- IUTEST_PRINTTOSTRING_EQ(ck, s);
272+ // LogChecker ck("00020BB7000091CE00005BB6");
273+ LogChecker ck("00020BB7");
274+ IUTEST_PRINTTOSTRING_CONTAINE(ck, s);
274275 IUTEST_STREAMOUT_CHECK(p);
275276 }
276277 else if( s[0] == '?' )
--- trunk/wercker.yml (revision 1416)
+++ trunk/wercker.yml (revision 1417)
@@ -1,31 +1,6 @@
1-# This references the default Python container from
2-# the Docker Hub with the 2.7 tag:
3-# https://registry.hub.docker.com/_/python/
4-# If you want to use a slim Python container with
5-# version 3.4.3 you would use: python:3.4-slim
6-# If you want Google's container you would reference google/python
7-# Read more about containers on our dev center
8-# http://devcenter.wercker.com/docs/containers/index.html
91 box: python
10-# You can also use services such as databases. Read more on our dev center:
11-# http://devcenter.wercker.com/docs/services/index.html
12-# services:
13- # - postgres
14- # http://devcenter.wercker.com/docs/services/postgresql.html
15-
16- # - mongo
17- # http://devcenter.wercker.com/docs/services/mongodb.html
18-
19-# This is the build pipeline. Pipelines are the core of wercker
20-# Read more about pipelines on our dev center
21-# http://devcenter.wercker.com/docs/pipelines/index.html
222 build:
23- # The steps that will be executed on build
24- # Steps make up the actions in your pipeline
25- # Read more about steps on our dev center:
26- # http://devcenter.wercker.com/docs/steps/index.html
273 steps:
28- # A step that executes `pip install` command.
294 - pip-install: &pip-install
305 requirements_file: ""
316 packages_list: "requests"
@@ -34,8 +9,6 @@
349 # - pip-install:
3510 # clean_wheel_dir: true
3611
37- # A custom script step, name value is used in the UI
38- # and the code value contains the command that get executed
3912 - script:
4013 name: echo python information
4114 code: |
@@ -48,6 +21,36 @@
4821 cd tools/wandbox
4922 python iuwandbox.py --list-compiler --verbose
5023
24+gtest-compat:
25+ box: alpine
26+ docker: true
27+ steps:
28+ - script:
29+ name: Install docker
30+ code: apk --no-cache add docker
31+ - script:
32+ name: Launch docker container
33+ # https://devcenter.wercker.com/development/pipelines/direct-docker-access/#volumes-and-mounts
34+ code: |
35+ docker run --rm -d -i --name iutest-work -w /iutest ${DOCKER_IMAGE} bash
36+ docker cp . iutest-work:/iutest
37+ - script:
38+ name: Use GTest
39+ code: |
40+ docker exec iutest-work \
41+ make -C test USE_GTEST=1 \
42+ GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=${GTEST_EXPECT_LATEST} clean ${MAKE_TARGET}
43+ - script:
44+ name: Use GMock
45+ code: |
46+ docker exec iutest-work \
47+ make -C test USE_GTEST=1 USE_GMOCK=1 \
48+ GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=${GTEST_EXPECT_LATEST} clean ${MAKE_TARGET}
49+ - script:
50+ name: Clean docker container
51+ code: |
52+ docker stop iutest-work
53+
5154 wandbox:
5255 steps:
5356 - pip-install: *pip-install
@@ -76,14 +79,14 @@
7679 python ./iuwandbox.py ${IUWANDBOX_EXPERIMENTAL_OPTION} ${IUWANDBOX_COMMANDLINE_OPTION} -c $compiler --std "c++${IUWANDBOX_CPPVER}" ${IUWANDBOX_ADD_OPTION} ${IUWANDBOX_STDC_ADD_OPTION};
7780 done
7881
79- - script: &gnucpp
80- name: gnuc++
81- code: |
82- cd tools/wandbox
83- for compiler in ${IUWANDBOX_COMPILER}
84- do
85- python ./iuwandbox.py ${IUWANDBOX_EXPERIMENTAL_OPTION} ${IUWANDBOX_COMMANDLINE_OPTION} -c $compiler --std "gnu++${IUWANDBOX_CPPVER}" ${IUWANDBOX_ADD_OPTION} ${IUWANDBOX_STDC_ADD_OPTION};
86- done
82+ # - script: &gnucpp
83+ # name: gnuc++
84+ # code: |
85+ # cd tools/wandbox
86+ # for compiler in ${IUWANDBOX_COMPILER}
87+ # do
88+ # python ./iuwandbox.py ${IUWANDBOX_EXPERIMENTAL_OPTION} ${IUWANDBOX_COMMANDLINE_OPTION} -c $compiler --std "gnu++${IUWANDBOX_CPPVER}" ${IUWANDBOX_ADD_OPTION} ${IUWANDBOX_STDC_ADD_OPTION};
89+ # done
8790
8891 wandbox-no-experimental:
8992 steps:
@@ -91,7 +94,7 @@
9194 - script: *make-fused
9295 - script: *setup
9396 - script: *cpp
94- - script: *gnucpp
97+ # - script: *gnucpp
9598
9699 wandbox-all-compiler:
97100 steps:
Show on old repository browser