• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1400 (tree)
Zeit2020-01-08 10:40:55
Autorsrz_zumix

Log Message

Merge pull request #360 from srz-zumix/develop

1.17.0.2
git@5538799fda4c6d9f09fd85038fc7e754071d7325
https://github.com/srz-zumix/iutest/commit/5538799fda4c6d9f09fd85038fc7e754071d7325

Ändern Zusammenfassung

Diff

--- trunk/COPYING (revision 1399)
+++ trunk/COPYING (nonexistent)
@@ -1,124 +0,0 @@
1-----------------------------------------------------------------------
2-iutest
3-https://github.com/srz-zumix/iutest
4-----------------------------------------------------------------------
5-
6-BSD 3-Clause License
7-
8-Copyright (c) 2011-2019, Takazumi Shirayanagi
9-All rights reserved.
10-
11-Redistribution and use in source and binary forms, with or without
12-modification, are permitted provided that the following conditions are met:
13-
14-* Redistributions of source code must retain the above copyright notice, this
15- list of conditions and the following disclaimer.
16-
17-* Redistributions in binary form must reproduce the above copyright notice,
18- this list of conditions and the following disclaimer in the documentation
19- and/or other materials provided with the distribution.
20-
21-* Neither the name of the copyright holder nor the names of its
22- contributors may be used to endorse or promote products derived from
23- this software without specific prior written permission.
24-
25-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
26-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
27-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
28-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
29-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
30-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
31-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
32-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
33-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
34-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35-
36-----------------------------------------------------------------------
37-wandbox-api
38-https://github.com/srz-zumix/wandbox-api
39-----------------------------------------------------------------------
40-
41-The MIT License (MIT)
42-
43-Copyright (c) 2014 Takazumi Shirayanagi
44-
45-Permission is hereby granted, free of charge, to any person obtaining a copy
46-of this software and associated documentation files (the "Software"), to deal
47-in the Software without restriction, including without limitation the rights
48-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
49-copies of the Software, and to permit persons to whom the Software is
50-furnished to do so, subject to the following conditions:
51-
52-The above copyright notice and this permission notice shall be included in all
53-copies or substantial portions of the Software.
54-
55-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
56-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
57-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
58-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
59-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
60-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
61-SOFTWARE.
62-
63-
64-----------------------------------------------------------------------
65-paizaio-api
66-https://github.com/srz-zumix/paizaio-api
67-----------------------------------------------------------------------
68-
69-The MIT License (MIT)
70-
71-Copyright (c) 2014 srz_zumix
72-
73-Permission is hereby granted, free of charge, to any person obtaining a copy
74-of this software and associated documentation files (the "Software"), to deal
75-in the Software without restriction, including without limitation the rights
76-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
77-copies of the Software, and to permit persons to whom the Software is
78-furnished to do so, subject to the following conditions:
79-
80-The above copyright notice and this permission notice shall be included in all
81-copies or substantial portions of the Software.
82-
83-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
84-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
85-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
86-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
87-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
88-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
89-SOFTWARE.
90-
91-
92-----------------------------------------------------------------------
93-Google Test samples and compatible code (partial) is:
94-https://github.com/google/googletest/tree/master/googletest
95-----------------------------------------------------------------------
96-
97-Copyright 2008, Google Inc.
98-All rights reserved.
99-
100-Redistribution and use in source and binary forms, with or without
101-modification, are permitted provided that the following conditions are
102-met:
103-
104- * Redistributions of source code must retain the above copyright
105-notice, this list of conditions and the following disclaimer.
106- * Redistributions in binary form must reproduce the above
107-copyright notice, this list of conditions and the following disclaimer
108-in the documentation and/or other materials provided with the
109-distribution.
110- * Neither the name of Google Inc. nor the names of its
111-contributors may be used to endorse or promote products derived from
112-this software without specific prior written permission.
113-
114-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
115-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
116-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
117-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
118-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
119-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
120-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
121-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
122-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
123-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
124-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- trunk/.travis.yml (revision 1399)
+++ trunk/.travis.yml (revision 1400)
@@ -1,4 +1,4 @@
1-dist: xenial
1+dist: bionic
22
33 language: cpp
44
@@ -18,9 +18,9 @@
1818 addons:
1919 apt: &apt-global
2020 sources: &apt-common-sources
21- - ubuntu-toolchain-r-test
22- - llvm-toolchain-xenial-8
23- - llvm-toolchain-xenial
21+ - sourceline: 'ppa:ubuntu-toolchain-r/test'
22+ - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main'
23+ - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main'
2424 packages: &apt-common-packages
2525 - clang-8
2626 - g++-9
@@ -33,7 +33,6 @@
3333 before_install:
3434 - |
3535 if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
36- nproc
3736 ulimit -c unlimited
3837 sudo bash -c 'echo "core_x_%e" > /proc/sys/kernel/core_pattern'
3938 fi
@@ -60,8 +59,8 @@
6059 if [ "${CXX}" = 'clang++' ] && [ "${TRAVIS_OS_NAME}" != 'osx' ] && [ "${USE_COVERAGE}" = '' ]; then
6160 export CC=clang-8
6261 export CXX=clang++-8
63- #update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 90
64- #update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 90
62+ #update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 90
63+ #update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 90
6564 fi
6665
6766 install:
--- trunk/LICENSE (revision 1399)
+++ trunk/LICENSE (revision 1400)
@@ -1,6 +1,6 @@
11 BSD 3-Clause License
22
3-Copyright (c) 2011-2019, Takazumi Shirayanagi
3+Copyright (c) 2011-2020, Takazumi Shirayanagi
44 All rights reserved.
55
66 Redistribution and use in source and binary forms, with or without
--- trunk/README.md (revision 1399)
+++ trunk/README.md (revision 1400)
@@ -7,11 +7,12 @@
77 [![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%2Fiutest_unittest?branch=master&type=cf-2)]( 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)
88 [![Codeship Status for srz-zumix/iutest](https://codeship.com/projects/5bc87030-5b41-0133-6000-4242aa07dce3/status?branch=master)](https://codeship.com/projects/110695)
99 [![Drone Build Status](https://cloud.drone.io/api/badges/srz-zumix/iutest/status.svg?branch=master)](https://cloud.drone.io/srz-zumix/iutest)
10-[![GitHub Actions Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions/badge.svg?branch=master)](https://github.com/srz-zumix/iutest/actions)
10+[![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)
1111 [![GitLab CI pipeline status](https://gitlab.com/srz-zumix/iutest-test/badges/master/pipeline.svg)](https://gitlab.com/srz-zumix/iutest-test/commits/master)
1212 [![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)
1313 [![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)
1414 [![Semaphore Build Status](https://semaphoreci.com/api/v1/srz_zumix/iutest/branches/master/badge.svg)](https://semaphoreci.com/srz_zumix/iutest)
15+[![Semaphore 2.0 Build Status](https://iutest.semaphoreci.com/badges/iutest/branches/master.svg)](https://iutest.semaphoreci.com/projects/iutest)
1516 [![Shippable Run Status](https://api.shippable.com/projects/541904d2ac22859af743f867/badge?branch=master)](https://app.shippable.com/github/srz-zumix/iutest)
1617 [![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)
1718 [![Wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/master "wercker status")](https://app.wercker.com/project/bykey/d385156052aa4118a7f24affe4a8f851)
@@ -21,6 +22,7 @@
2122 [![Coveralls Coverage Status](https://coveralls.io/repos/github/srz-zumix/iutest/badge.svg?branch=master)](https://coveralls.io/github/srz-zumix/iutest?branch=master)
2223 [![Coverity Scan Build Status](https://scan.coverity.com/projects/1316/badge.svg)](https://scan.coverity.com/projects/srz-zumix-iutest)
2324 [![GuardRails badge](https://badges.guardrails.io/srz-zumix/iutest.svg?token=fe1bb5ca5f743800d26e4d2b7282c5b316df83c0b228048f4192510bdd7280f0)](https://dashboard.guardrails.io/default/gh/srz-zumix/iutest)
25+[![GitHub Actions reviewdog Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions%20reviewdog/badge.svg?branch=master)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions+reviewdog%22)
2426 [![INSPECODE Job Status](https://inspecode.rocro.com/badges/github.com/srz-zumix/iutest/status?token=wt0KUnRUG1-Ul2mLrg8ComR1RznZV3VoXecBJHW0EIk&branch=master)](https://inspecode.rocro.com/jobs/github.com/srz-zumix/iutest/latest?completed=true&branch=master)
2527 [![Rocro INSPECODE Report](https://inspecode.rocro.com/badges/github.com/srz-zumix/iutest/report?token=wt0KUnRUG1-Ul2mLrg8ComR1RznZV3VoXecBJHW0EIk&branch=master)](https://inspecode.rocro.com/reports/github.com/srz-zumix/iutest/branch/master/summary)
2628 [![New(3-clause) BSD License](https://img.shields.io/badge/license-New_BSD-blue.svg)](http://opensource.org/licenses/BSD-3-Clause)
@@ -119,16 +121,18 @@
119121 |[Circle CI](https://circleci.com/)|[![CircleCI](https://circleci.com/gh/srz-zumix/iutest/tree/master.svg?style=svg)](https://circleci.com/gh/srz-zumix/iutest/tree/master)|[![CircleCI](https://circleci.com/gh/srz-zumix/iutest/tree/develop.svg?style=svg)](https://circleci.com/gh/srz-zumix/iutest/tree/develop)|Basic test with opmimize options|
120122 |[Cirrus CI](https://cirrus-ci.org/)|[![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=master)](https://cirrus-ci.com/github/srz-zumix/iutest/master)|[![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=develop)](https://cirrus-ci.com/github/srz-zumix/iutest/develop)|g++/clang std=c++14,17.. Basic tests, FreeBSD Basic tests|
121123 |[Codacy](https://www.codacy.com/)|[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e6407b63c9c844d080ed71c7707bded9?branch=master)](https://www.codacy.com/app/srz-zumix/iutest?utm_source=github.com&utm_medium=referral&utm_content=srz-zumix/iutest&utm_campaign=Badge_Grade)|[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e6407b63c9c844d080ed71c7707bded9?branch=develop)](https://www.codacy.com/app/srz-zumix/iutest?utm_source=github.com&utm_medium=referral&utm_content=srz-zumix/iutest&utm_campaign=Badge_Grade)|Shellcheck, Cppcheck, PyLint, etc...|
122-|[Codefresh](https://codefresh.io/)|[![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)|[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%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)|Benchmark test, Gcc 7/8/9 basic test|
124+|[Codefresh](https://codefresh.io/)|[![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)|[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%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|
123125 |[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)|Update documents, Check coding standard of the project|
124126 |[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|
125127 |[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|
126-|[GitHub Actions](https://github.com/srz-zumix/iutest/actions)|[![GitHub Actions Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions/badge.svg?branch=master)](https://github.com/srz-zumix/iutest/actions)|[![GitHub Actions Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions)|Basic test (Windows LLVM clang and mingw), EditorConfig Lint, Include What You Use, arm-none-eabi-gcc build|
128+|[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|
129+|[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%20reviewdog/badge.svg?branch=master)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions+reviewdog%22+branch%3Amaster)|[![GitHub Actions Reviewdog Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions%20reviewdog/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions+reviewdog%22+branch%3Amaster)|Reviewdog (shellcheck, cpplint)|
127130 |[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)|
128131 |[INSPECODE](https://rocro.com/)|[![Job Status](https://inspecode.rocro.com/badges/github.com/srz-zumix/iutest/status?token=wt0KUnRUG1-Ul2mLrg8ComR1RznZV3VoXecBJHW0EIk&branch=master)](https://inspecode.rocro.com/jobs/github.com/srz-zumix/iutest/latest?completed=true&branch=master)|[![Job Status](https://inspecode.rocro.com/badges/github.com/srz-zumix/iutest/status?token=wt0KUnRUG1-Ul2mLrg8ComR1RznZV3VoXecBJHW0EIk&branch=develop)](https://inspecode.rocro.com/jobs/github.com/srz-zumix/iutest/latest?completed=true&branch=develop)|Spell check, Cppcheck, cpplint, metrics, scan-build|
129132 |[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)||
130133 |[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|
131134 |[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|
135+|[Semaphore 2.0](https://semaphoreci.com/)|[![Semaphore 2.0 Build Status](https://iutest.semaphoreci.com/badges/iutest/branches/master.svg)](https://iutest.semaphoreci.com/projects/iutest)|[![Semaphore 2.0 Build Status](https://iutest.semaphoreci.com/badges/iutest/branches/develop.svg)](https://iutest.semaphoreci.com/projects/iutest)|Scan-build|
132136 |[Shippable](http://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)|
133137 |[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|
134138 |[Wercker](http://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)|
@@ -155,7 +159,9 @@
155159 License
156160 --------------------------------------------------
157161
158- Copyright (c) 2011-2019, Takazumi Shirayanagi,
162+ Copyright (c) 2011-2020, Takazumi Shirayanagi,
159163 All rights reserved.
160164
161165 This software is released under the New(3-clause) BSD License, see LICENSE
166+
167+ If you distribute iutest, you might enjoy the [LICENSE-MIXING](docs/LICENSE-MIXING) document.
--- trunk/codefresh.yml (revision 1399)
+++ trunk/codefresh.yml (revision 1400)
@@ -57,12 +57,12 @@
5757 image: gcc:8
5858 environment:
5959 - OUTDIR=gcc8
60- BuildBasicTest_gcc7:
61- <<: *build_all_test
62- title: Build Basic all_tests - gcc7
63- image: gcc:7
64- environment:
65- - OUTDIR=gcc7
60+ # BuildBasicTest_gcc7:
61+ # <<: *build_all_test
62+ # title: Build Basic all_tests - gcc7
63+ # image: gcc:7
64+ # environment:
65+ # - OUTDIR=gcc7
6666 BuildOtherUnitTests:
6767 type: parallel
6868 stage: build_other_tests
@@ -88,16 +88,16 @@
8888 - name: BuildBasicTest_gcc8
8989 on:
9090 - success
91- BuildOtherTest_gcc7:
92- <<: *build_other_test
93- image: gcc:7
94- environment:
95- - OUTDIR=gcc7
96- when:
97- steps:
98- - name: BuildBasicTest_gcc7
99- on:
100- - success
91+ # BuildOtherTest_gcc7:
92+ # <<: *build_other_test
93+ # image: gcc:7
94+ # environment:
95+ # - OUTDIR=gcc7
96+ # when:
97+ # steps:
98+ # - name: BuildBasicTest_gcc7
99+ # on:
100+ # - success
101101 RunningAllUnitTests:
102102 type: parallel
103103 stage: run_tests
@@ -123,16 +123,16 @@
123123 - name: BuildOtherTest_gcc8
124124 on:
125125 - success
126- RunningUnitTest_gcc7:
127- <<: *run_test
128- image: gcc:7
129- environment:
130- - OUTDIR=gcc7
131- when:
132- steps:
133- - name: BuildOtherTest_gcc7
134- on:
135- - success
126+ # RunningUnitTest_gcc7:
127+ # <<: *run_test
128+ # image: gcc:7
129+ # environment:
130+ # - OUTDIR=gcc7
131+ # when:
132+ # steps:
133+ # - name: BuildOtherTest_gcc7
134+ # on:
135+ # - success
136136 Benchmark:
137137 title: Running Benchmark Tests
138138 stage: benchmark
@@ -157,9 +157,9 @@
157157 - name: RunningUnitTest_gcc8
158158 on:
159159 - success
160- - name: RunningUnitTest_gcc7
161- on:
162- - success
160+ # - name: RunningUnitTest_gcc7
161+ # on:
162+ # - success
163163 on_success:
164164 metadata:
165165 set:
--- trunk/docs/cover.html (revision 1399)
+++ trunk/docs/cover.html (revision 1400)
@@ -23,7 +23,7 @@
2323 <div class="contents">
2424 <h1>IUTEST</h1>
2525 <div class="text_block">
26-Iris Unit Test Framework : 2019 / 01 / 04<br />
26+Iris Unit Test Framework : 2020 / 01 / 02<br />
2727 <br />
2828 </div>
2929 <h2>はじめに</h2>
@@ -96,7 +96,7 @@
9696 <pre>
9797 BSD 3-Clause License
9898
99- Copyright (c) 2011-2019, Takazumi Shirayanagi
99+ Copyright (c) 2011-2020, Takazumi Shirayanagi
100100 All rights reserved.
101101
102102 Redistribution and use in source and binary forms, with or without
@@ -129,7 +129,7 @@
129129 </div> <!-- end of contents -->
130130
131131 <br />
132-<div class="copyright">Copyright (c) 2011-2019, Takazumi-Shirayanagi, All rights reserved.</div>
132+<div class="copyright">Copyright (c) 2011-2020, Takazumi-Shirayanagi, All rights reserved.</div>
133133
134134 </body>
135135 </html>
--- trunk/docs/primer.html (revision 1399)
+++ trunk/docs/primer.html (revision 1400)
@@ -706,7 +706,7 @@
706706 </div> <!-- end of contents -->
707707
708708 <br />
709-<div class="copyright">Copyright (c) 2011-2019, Takazumi-Shirayanagi, All rights reserved.</div>
709+<div class="copyright">Copyright (c) 2011-2020, Takazumi-Shirayanagi, All rights reserved.</div>
710710
711711 </body>
712712 </html>
--- trunk/include/gtest/iutest_switch_for_gtest.hpp (revision 1399)
+++ trunk/include/gtest/iutest_switch_for_gtest.hpp (revision 1400)
@@ -173,7 +173,11 @@
173173 #define IUTEST_HAS_SPI_LAMBDA_SUPPORT 0
174174 #define IUTEST_HAS_CATCH_SEH_EXCEPTION_ASSERTION 0
175175 #define IUTEST_HAS_GENRAND 0
176-#define IUTEST_HAS_PRINT_TO 1
176+#if GTEST_VER < 0x01060000
177+# define IUTEST_HAS_PRINT_TO 0
178+#else
179+# define IUTEST_HAS_PRINT_TO 1
180+#endif
177181 #define IUTEST_HAS_TESTNAME_ALIAS 0
178182 #define IUTEST_HAS_TESTNAME_ALIAS_JP 0
179183 #define IUTEST_HAS_STREAM_RESULT 1
@@ -368,6 +372,88 @@
368372 // ostream
369373 typedef ::std::ostream iu_ostream;
370374
375+/* gtest 1.5 or less compatible...
376+#if !IUTEST_HAS_PRINT_TO
377+namespace internal
378+{
379+ inline char ToHex(unsigned int n)
380+ {
381+ return static_cast<char>((n&0xF) >= 0xA ? 'A'+((n&0xF)-0xA) : '0'+(n&0xF));
382+ }
383+
384+ inline void PrintBytesInObjectTo(const unsigned char* buf, size_t size, iu_ostream& os)
385+ {
386+ os << size << "-Byte object < ";
387+ if( buf != NULL && size > 0 )
388+ {
389+ for( size_t i=0; i < size; ++i )
390+ {
391+ if( i == 8 )
392+ {
393+ os << "... ";
394+ break;
395+ }
396+ const unsigned char n = buf[i];
397+ os << ToHex((n>>4)&0xF) << ToHex(n&0xF) << " ";
398+ }
399+ }
400+ os << ">";
401+ }
402+}
403+
404+namespace print_internal
405+{
406+ template<typename T>
407+ iu_ostream& operator << (iu_ostream& os, const T& value)
408+ {
409+ const unsigned char* buf = const_cast<const unsigned char*>(
410+ reinterpret_cast<const volatile unsigned char*>(&value));
411+ const size_t size = sizeof(T);
412+ internal::PrintBytesInObjectTo(buf, size, os);
413+ return os;
414+ }
415+}
416+
417+namespace internal
418+{
419+
420+#if IUTEST_HAS_NULLPTR
421+// template<>
422+// String StreamableToString<::std::nullptr_t>(const ::std::nullptr_t&)
423+// {
424+// return (Message() << "nullptr").GetString();
425+// }
426+#endif
427+
428+#if IUTEST_HAS_DECLTYPE
429+
430+template<typename T>
431+char is_ostreamable(const T&);
432+template<typename T>
433+auto is_ostreamable(const T& val) -> decltype((StrStream() << val), int());
434+
435+template<typename T>
436+String StreamableToString(const T& val, typename std::enable_if<std::is_same<decltype(is_ostreamable(val)), char>::value>::type*& = iutest_type_traits::enabler::value)
437+{
438+ using namespace print_internal;
439+ StrStream ss_;
440+ ss_ << val;
441+ return StrStreamToString(&ss_);
442+}
443+
444+template<typename T, typename std::enable_if<std::is_same<T, ::std::nullptr_t>::value>::type* = nullptr>
445+String StreamableToString(const T&)
446+{
447+ return (Message() << "nullptr").GetString();
448+}
449+
450+#endif
451+
452+}
453+
454+#endif
455+*/
456+
371457 #if GTEST_VER < 0x01060000
372458
373459 namespace dummy_printer
--- trunk/include/gtest/switch/iutest_switch_core.hpp (revision 1399)
+++ trunk/include/gtest/switch/iutest_switch_core.hpp (revision 1400)
@@ -120,7 +120,6 @@
120120 #undef IUTEST_TEST_
121121
122122 #undef IUTEST_SUPPRESS_UNREACHABLE_CODE_WARNING
123-#undef IUTEST_PP_CAT
124123 #undef IUTEST_IS_NULLLITERAL
125124
126125 #undef IUTEST_THROUGH_ANALYSIS_ASSUME
@@ -171,6 +170,9 @@
171170
172171 #define IUTEST_SUPPRESS_UNREACHABLE_CODE_WARNING GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_
173172
173+#if defined(IUTEST_PP_CAT)
174+# undef IUTEST_PP_CAT
175+#endif
174176 #define IUTEST_PP_CAT GTEST_CONCAT_TOKEN_
175177
176178 #if defined(GTEST_IS_NULL_LITERAL_)
--- trunk/include/gtest/switch/iutest_switch_gmock.hpp (revision 1399)
+++ trunk/include/gtest/switch/iutest_switch_gmock.hpp (revision 1400)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2014-2018, Takazumi Shirayanagi\n
9+ * Copyright (C) 2014-2019, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -36,6 +36,7 @@
3636 #undef IUTEST_HAS_MATCHER_ELEMENTSARE
3737 #undef IUTEST_HAS_MATCHER_ELEMENTSAREARRAYFORWARD
3838 #undef IUTEST_HAS_MATCHER_REGEX
39+#undef IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR
3940
4041 #endif
4142
@@ -49,6 +50,11 @@
4950 #define IUTEST_HAS_MATCHER_ELEMENTSARE 1
5051 #define IUTEST_HAS_MATCHER_ELEMENTSAREARRAYFORWARD 0
5152 #define IUTEST_HAS_MATCHER_REGEX 1
53+#if GMOCK_VER > 0x01060000
54+# define IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR 1
55+#else
56+# define IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR 0
57+#endif
5258
5359 #define IUTEST_ASSERT_THAT ASSERT_THAT
5460 #define IUTEST_EXPECT_THAT EXPECT_THAT
@@ -66,6 +72,7 @@
6672 #define IUTEST_HAS_MATCHER_ELEMENTSARE 0
6773 #define IUTEST_HAS_MATCHER_ELEMENTSAREARRAYFORWARD 0
6874 #define IUTEST_HAS_MATCHER_REGEX 0
75+#define IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR 0
6976
7077 #endif
7178
@@ -92,7 +99,7 @@
9299 using ::testing::NanSensitiveDoubleEq;
93100 using ::testing::NanSensitiveFloatEq;
94101
95-#if GMOCK_VER > 0x01060000
102+#if IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR
96103 using ::testing::DoubleNear;
97104 using ::testing::FloatNear;
98105 using ::testing::NanSensitiveDoubleNear;
--- trunk/include/internal/iutest_option_message.hpp (revision 1399)
+++ trunk/include/internal/iutest_option_message.hpp (revision 1400)
@@ -124,6 +124,7 @@
124124 m (IUTEST_HAS_MATCHERS); \
125125 m (IUTEST_HAS_MATCHER_ALLOF_AND_ANYOF); \
126126 m (IUTEST_HAS_MATCHER_ELEMENTSARE); \
127+ m (IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR); \
127128 m (IUTEST_HAS_MATCHER_REGEX); \
128129 m (IUTEST_HAS_MINIDUMP); \
129130 m (IUTEST_HAS_PACKAGE); \
@@ -185,6 +186,7 @@
185186 IIUT_SHOW_MACRO(IUTEST_HAS_CTIME);
186187 IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_ANY);
187188 IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_ARRAY);
189+ IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_CHARCONV);
188190 IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_CHRONO);
189191 IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_CODECVT);
190192 IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_CSTDINT);
@@ -263,10 +265,12 @@
263265 #ifdef __POSIX_VISIBLE
264266 IIUT_SHOW_MACRO(__POSIX_VISIBLE);
265267 #endif
266-
267268 #ifdef __USE_MINGW_ANSI_STDIO
268269 IIUT_SHOW_MACRO(__USE_MINGW_ANSI_STDIO);
269270 #endif
271+#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
272+ IIUT_SHOW_MACRO(__MAC_OS_X_VERSION_MIN_REQUIRED);
273+#endif
270274
271275 #undef IIUT_SHOW_MACRO
272276 }
--- trunk/include/internal/iutest_stdlib.hpp (revision 1399)
+++ trunk/include/internal/iutest_stdlib.hpp (revision 1400)
@@ -205,6 +205,9 @@
205205 # endif
206206 #endif
207207
208+#if _LIBCPP_VERSION < 9000
209+# define IUTEST_HAS_CXX_HDR_FILESYSTEM 0
210+#endif
208211 #if _LIBCPP_VERSION >= 3700
209212 # if !defined(IUTEST_HAS_STD_INVOKE) && IUTEST_HAS_CXX1Z
210213 # define IUTEST_HAS_STD_INVOKE 1
@@ -272,13 +275,19 @@
272275
273276 #if _MSC_VER >= 1900
274277 # if !defined(IUTEST_HAS_STD_QUICK_EXIT)
275-# define IUTEST_HAS_STD_QUICK_EXIT 1
278+# define IUTEST_HAS_STD_QUICK_EXIT 1
276279 # endif
277280 # if !defined(IUTEST_HAS_CXX_HDR_CUCHAR)
278-# define IUTEST_HAS_CXX_HDR_CUCHAR 1
281+# define IUTEST_HAS_CXX_HDR_CUCHAR 1
279282 # endif
280283 #endif
281284
285+#if _MSC_VER >= 1916
286+# if !defined(IUTEST_HAS_CXX_HDR_CHARCONV)
287+# define IUTEST_HAS_CXX_HDR_CHARCONV 1
288+# endif
289+#endif
290+
282291 // tuple
283292 #if (_MSC_VER > 1700) || (_MSC_VER == 1700 && _VARIADIC_MAX >= 9)
284293 # if !defined(IUTEST_HAS_STD_TUPLE)
@@ -308,6 +317,19 @@
308317 # endif
309318 #endif
310319
320+#if !defined(IUTEST_HAS_CXX_HDR_CHARCONV)
321+# if __has_include(<charconv>)
322+# define IUTEST_HAS_CXX_HDR_CHARCONV 1
323+# endif
324+#endif
325+
326+// apple(xcode) clang
327+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
328+# if __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
329+# define IUTEST_HAS_CXX_HDR_FILESYSTEM 0
330+# endif
331+#endif
332+
311333 #if !defined(IUTEST_HAS_CXX_HDR_FILESYSTEM)
312334 # if __has_include(<filesystem>)
313335 # define IUTEST_HAS_CXX_HDR_FILESYSTEM 1
@@ -361,55 +383,63 @@
361383 // defaults for include
362384 //! has any header
363385 #if !defined(IUTEST_HAS_CXX_HDR_ANY)
364-# define IUTEST_HAS_CXX_HDR_ANY 0
386+# define IUTEST_HAS_CXX_HDR_ANY 0
365387 #endif
366388 //! has array header
367389 #if !defined(IUTEST_HAS_CXX_HDR_ARRAY)
368-# define IUTEST_HAS_CXX_HDR_ARRAY 0
390+# define IUTEST_HAS_CXX_HDR_ARRAY 0
369391 #endif
392+//! has charconv header
393+#if !defined(IUTEST_HAS_CXX_HDR_CHARCONV)
394+# define IUTEST_HAS_CXX_HDR_CHARCONV 0
395+#endif
370396 //! has chrono header
371397 #if !defined(IUTEST_HAS_CXX_HDR_CHRONO)
372-# define IUTEST_HAS_CXX_HDR_CHRONO 0
398+# define IUTEST_HAS_CXX_HDR_CHRONO 0
373399 #endif
374-//! has codecvt header
400+/**
401+ * @brief has codecvt header
402+ * @note P0618R0 Deprecating <codecvt>: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0618r0.html
403+ * @deprecated
404+*/
375405 #if !defined(IUTEST_HAS_CXX_HDR_CODECVT)
376-# define IUTEST_HAS_CXX_HDR_CODECVT 0
406+# define IUTEST_HAS_CXX_HDR_CODECVT 0
377407 #endif
378408 //! has cstdint header
379409 #if !defined(IUTEST_HAS_CXX_HDR_CSTDINT)
380-# define IUTEST_HAS_CXX_HDR_CSTDINT 0
410+# define IUTEST_HAS_CXX_HDR_CSTDINT 0
381411 #endif
382412 //! has cuchar
383413 #if !defined(IUTEST_HAS_CXX_HDR_CUCHAR)
384-# define IUTEST_HAS_CXX_HDR_CUCHAR 0
414+# define IUTEST_HAS_CXX_HDR_CUCHAR 0
385415 #endif
386416 //! has filesystem
387417 #if !defined(IUTEST_HAS_CXX_HDR_FILESYSTEM)
388-# define IUTEST_HAS_CXX_HDR_FILESYSTEM 0
418+# define IUTEST_HAS_CXX_HDR_FILESYSTEM 0
389419 #endif
390420 //! has optional header
391421 #if !defined(IUTEST_HAS_CXX_HDR_OPTIONAL)
392-# define IUTEST_HAS_CXX_HDR_OPTIONAL 0
422+# define IUTEST_HAS_CXX_HDR_OPTIONAL 0
393423 #endif
394424 //! has random header
395425 #if !defined(IUTEST_HAS_CXX_HDR_RANDOM)
396-# define IUTEST_HAS_CXX_HDR_RANDOM 0
426+# define IUTEST_HAS_CXX_HDR_RANDOM 0
397427 #endif
398428 //! has regex header
399429 #if !defined(IUTEST_HAS_CXX_HDR_REGEX)
400-# define IUTEST_HAS_CXX_HDR_REGEX 0
430+# define IUTEST_HAS_CXX_HDR_REGEX 0
401431 #endif
402432 //! has string_view header
403433 #if !defined(IUTEST_HAS_CXX_HDR_STRING_VIEW)
404-# define IUTEST_HAS_CXX_HDR_STRING_VIEW 0
434+# define IUTEST_HAS_CXX_HDR_STRING_VIEW 0
405435 #endif
406436 //! has variant header
407437 #if !defined(IUTEST_HAS_CXX_HDR_VARIANT)
408-# define IUTEST_HAS_CXX_HDR_VARIANT 0
438+# define IUTEST_HAS_CXX_HDR_VARIANT 0
409439 #endif
410440 //! has cxxabi header
411441 #if !defined(IUTEST_HAS_HDR_CXXABI)
412-# define IUTEST_HAS_HDR_CXXABI 0
442+# define IUTEST_HAS_HDR_CXXABI 0
413443 #endif
414444
415445 //======================================================================
@@ -431,6 +461,9 @@
431461 #if IUTEST_HAS_CXX_HDR_VARIANT
432462 # include <variant>
433463 #endif
464+#if IUTEST_HAS_CXX_HDR_CHARCONV
465+# include <charconv>
466+#endif
434467
435468 //======================================================================
436469 // define
--- trunk/include/internal/iutest_string.hpp (revision 1399)
+++ trunk/include/internal/iutest_string.hpp (revision 1400)
@@ -334,13 +334,6 @@
334334 template<typename T>
335335 inline ::std::string ToOctString(T value)
336336 {
337-#if IUTEST_HAS_STD_TO_CHARS
338- const size_t kN = sizeof(T)*8;
339- char buf[kN] = { 0 };
340- const ::std::to_chars_result r = ::std::to_chars(buf, buf + kN, value, 8);
341- *r.ptr = '\0';
342- return buf;
343-#else
344337 const size_t kB = sizeof(T) * 8;
345338 const size_t kN = (kB + 2) / 3;
346339 const size_t kD = kB - (kN - 1) * 3;
@@ -354,7 +347,6 @@
354347 }
355348 buf[kN] = '\0';
356349 return buf;
357-#endif
358350 }
359351
360352 inline IUTEST_CXX_CONSTEXPR char ToHex(unsigned int n)
@@ -365,13 +357,6 @@
365357 template<typename T>
366358 inline ::std::string ToHexString(T value)
367359 {
368-#if IUTEST_HAS_STD_TO_CHARS
369- const size_t kN = sizeof(T)*8;
370- char buf[kN] = { 0 };
371- const ::std::to_chars_result r = ::std::to_chars(buf, buf + kN, value, 16);
372- *r.ptr = '\0';
373- return buf;
374-#else
375360 const size_t kN = sizeof(T)*2;
376361 char buf[kN + 1] = {0};
377362 for( size_t i=0; i < kN; ++i )
@@ -380,7 +365,6 @@
380365 }
381366 buf[kN] = '\0';
382367 return buf;
383-#endif
384368 }
385369
386370 inline ::std::string FormatIntWidth2(int value)
@@ -397,7 +381,7 @@
397381 ::std::string iu_to_string(const T& value)
398382 {
399383 const size_t kN = 128;
400- buf[kN] = { 0 };
384+ char buf[kN] = { 0 };
401385 const ::std::to_chars_result r = ::std::to_chars(buf, buf + kN, value);
402386 *r.ptr = '\0';
403387 return buf;
--- trunk/include/iutest.hpp (revision 1399)
+++ trunk/include/iutest.hpp (revision 1400)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 *
--- trunk/include/iutest_config.hpp (revision 1399)
+++ trunk/include/iutest_config.hpp (revision 1400)
@@ -288,6 +288,11 @@
288288 # endif
289289 #endif
290290
291+#if !defined(IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR)
292+//! Wether ::iutest::matchers::(NanSensitive)(Float|Double)Near is available
293+# define IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR 1
294+#endif
295+
291296 #if !defined(IUTEST_USE_THROW_ON_ASSERTION_FAILURE)
292297 /**
293298 * @brief 失敗時に例外を throw します。
--- trunk/include/iutest_matcher.hpp (revision 1399)
+++ trunk/include/iutest_matcher.hpp (revision 1400)
@@ -2061,6 +2061,8 @@
20612061
20622062 #endif
20632063
2064+#if IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR
2065+
20642066 /**
20652067 * @brief Make FloatingPoint Near matcher
20662068 * @details argument は expected と max_abs_error 以内の差分
@@ -2143,6 +2145,8 @@
21432145
21442146 #endif
21452147
2148+#endif
2149+
21462150 /**
21472151 * @brief Make StrEq matcher
21482152 * @details argument == expected
--- trunk/include/iutest_printers.hpp (revision 1399)
+++ trunk/include/iutest_printers.hpp (revision 1400)
@@ -51,7 +51,7 @@
5151 #else
5252 const unsigned char n = buf[i];
5353 #endif
54- *os << detail::ToHex((n>>4)&0xF) << ToHex(n&0xF) << " ";
54+ *os << ToHex((n>>4)&0xF) << ToHex(n&0xF) << " ";
5555 }
5656 }
5757 *os << ">";
--- trunk/include/iutest_ver.hpp (revision 1399)
+++ trunk/include/iutest_ver.hpp (revision 1400)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01170001u //!< iutest version 1.17.0.1
21-#define IUTEST_MAJORVER 0x01u //!< Major Version
22-#define IUTEST_MINORVER 0x17u //!< Minor Version
23-#define IUTEST_MICROVER 0x00u //!< Micro Version
24-#define IUTEST_REVISION 0x01u //!< Revision
20+#define IUTEST_VER 0x01170002u //!< iutest version 1.17.0.2
21+#define IUTEST_MAJORVER 0x01u //!< Major Version
22+#define IUTEST_MINORVER 0x17u //!< Minor Version
23+#define IUTEST_MICROVER 0x00u //!< Micro Version
24+#define IUTEST_REVISION 0x02u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
@@ -33,7 +33,7 @@
3333 * google group: https://groups.google.com/forum/?fromgroups#!forum/g-iutest \n
3434 *
3535 * @par copyright
36- * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
36+ * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
3737 * This software is released under the new BSD License.
3838 *
3939 * @par LICENSE
--- trunk/peak_flow.yml (revision 1399)
+++ trunk/peak_flow.yml (revision 1400)
@@ -1,9 +1,8 @@
11 before_script:
22 - cat /proc/cpuinfo || true
33 - cat /proc/meminfo || true
4- - nproc
54 - gcc --version || true
65 - clang --version || true
76 script:
8- - make -C test -j$((`nproc`))
9- - make -C test test
7+ - make -C test -j4 CXXFLAGS=-ftime-report
8+ # - make -C test test
--- trunk/projects/cmake/exsample.bat (revision 1399)
+++ trunk/projects/cmake/exsample.bat (nonexistent)
@@ -1,18 +0,0 @@
1-@echo off
2-
3-SET VCVERSION=15
4-SET DIRNAME=vc%VCVERSION%
5-
6-pushd .
7-if not exist tmp mkdir tmp
8-cd tmp
9-if errorlevel 1 goto end
10-if not exist %DIRNAME% mkdir %DIRNAME%
11-cd %DIRNAME%
12-if errorlevel 1 goto end
13-
14-cmake -G "Visual Studio %VCVERSION%" ../../ %*
15-
16-:end
17-popd
18-pause
--- trunk/projects/cmake/CMakeLists.txt (revision 1399)
+++ trunk/projects/cmake/CMakeLists.txt (revision 1400)
@@ -3,7 +3,7 @@
33 #
44
55 # CMake バージョン
6-cmake_minimum_required(VERSION 3.0.2)
6+cmake_minimum_required(VERSION 3.2)
77
88 # option
99 option(build_gtest_samples "gtest sample build." OFF)
@@ -24,6 +24,7 @@
2424
2525 # プロジェクト名
2626 project(iutest CXX C)
27+set(CMAKE_CXX_STANDARD 17)
2728
2829 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
2930 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE NEVER)
--- trunk/projects/cmake/example.bat (nonexistent)
+++ trunk/projects/cmake/example.bat (revision 1400)
@@ -0,0 +1,18 @@
1+@echo off
2+
3+SET VCVERSION=16
4+SET DIRNAME=vc%VCVERSION%
5+
6+pushd .
7+if not exist tmp mkdir tmp
8+cd tmp
9+if errorlevel 1 goto end
10+if not exist %DIRNAME% mkdir %DIRNAME%
11+cd %DIRNAME%
12+if errorlevel 1 goto end
13+
14+cmake -G "Visual Studio %VCVERSION%" ../../ %*
15+
16+:end
17+popd
18+pause
--- trunk/sider.yml (revision 1399)
+++ trunk/sider.yml (revision 1400)
@@ -5,4 +5,9 @@
55 glob: '**/*.{css,scss}'
66 goodcheck:
77 config: ./.ci/goodcheck.yml
8+ cpplint:
9+ filter: "-whitespace/parens,-whitespace/braces"
10+ linelength: 150
11+ extensions: "c,cpp"
12+ headers: "h,hpp,ipp"
813
--- trunk/test/assertion_tests.cpp (revision 1399)
+++ trunk/test/assertion_tests.cpp (revision 1400)
@@ -93,7 +93,7 @@
9393 }
9494 #endif
9595
96-#if IUTEST_HAS_STRONG_ENUMS
96+#if IUTEST_HAS_STRONG_ENUMS && IUTEST_HAS_PRINT_TO
9797 {
9898 enum class eTest { Var1=1, Var2=1 };
9999 IUTEST_ASSERT_EQ(eTest::Var1, eTest::Var2);
--- trunk/test/check_stdlib.cpp (revision 1399)
+++ trunk/test/check_stdlib.cpp (revision 1400)
@@ -29,6 +29,7 @@
2929 {
3030 SHOW_MACRO(IUTEST_HAS_CXX_HDR_ANY);
3131 SHOW_MACRO(IUTEST_HAS_CXX_HDR_ARRAY);
32+ SHOW_MACRO(IUTEST_HAS_CXX_HDR_CHARCONV);
3233 SHOW_MACRO(IUTEST_HAS_CXX_HDR_CHRONO);
3334 SHOW_MACRO(IUTEST_HAS_CXX_HDR_CODECVT);
3435 SHOW_MACRO(IUTEST_HAS_CXX_HDR_CSTDINT);
--- trunk/test/matcher_tests.cpp (revision 1399)
+++ trunk/test/matcher_tests.cpp (revision 1400)
@@ -113,20 +113,6 @@
113113 IUTEST_EXPECT_THAT(d0, FloatingPointEq(0.0));
114114 }
115115
116-IUTEST(Matcher, FloatNear)
117-{
118- IUTEST_EXPECT_THAT(f0, FloatNear(0.0f, 0.0f));
119- IUTEST_EXPECT_THAT(f0, FloatNear(1.0f, 1.0f));
120- IUTEST_EXPECT_THAT(f0, FloatingPointNear(0.0f, 0.0f));
121-}
122-
123-IUTEST(Matcher, DoubleNear)
124-{
125- IUTEST_EXPECT_THAT(d0, DoubleNear(0.0, 0.0));
126- IUTEST_EXPECT_THAT(d0, DoubleNear(1.0, 1.0));
127- IUTEST_EXPECT_THAT(d0, FloatingPointNear(0.0, 0.0));
128-}
129-
130116 #if IUTEST_HAS_LONG_DOUBLE
131117
132118 IUTEST(Matcher, LongDoubleEq)
@@ -136,12 +122,6 @@
136122 IUTEST_EXPECT_THAT(ldx, LongDoubleEq(0.001));
137123 }
138124
139-IUTEST(Matcher, LongDoubleNear)
140-{
141- IUTEST_EXPECT_THAT(ld0, LongDoubleNear(0.0, 0.0));
142- long double ldx = 0.001;
143- IUTEST_EXPECT_THAT(ld0, LongDoubleNear(ldx, ldx));
144-}
145125 #endif
146126
147127 IUTEST(Matcher, NanSensitiveFloatEq)
@@ -158,6 +138,44 @@
158138 IUTEST_EXPECT_THAT(0.0/d0, NanSensitiveFloatingPointEq(0.0/d0));
159139 }
160140
141+#if IUTEST_HAS_LONG_DOUBLE
142+
143+IUTEST(Matcher, NanSensitiveLongDoubleEq)
144+{
145+ IUTEST_EXPECT_THAT(ld0, NanSensitiveLongDoubleEq(0.0));
146+ IUTEST_EXPECT_THAT(0.0/ld0, NanSensitiveLongDoubleEq(0.0/ld0));
147+ long double ldx = 0.001;
148+ IUTEST_EXPECT_THAT(ldx, NanSensitiveLongDoubleEq(0.001));
149+}
150+
151+#endif
152+
153+#if IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR
154+
155+IUTEST(Matcher, FloatNear)
156+{
157+ IUTEST_EXPECT_THAT(f0, FloatNear(0.0f, 0.0f));
158+ IUTEST_EXPECT_THAT(f0, FloatNear(1.0f, 1.0f));
159+ IUTEST_EXPECT_THAT(f0, FloatingPointNear(0.0f, 0.0f));
160+}
161+
162+IUTEST(Matcher, DoubleNear)
163+{
164+ IUTEST_EXPECT_THAT(d0, DoubleNear(0.0, 0.0));
165+ IUTEST_EXPECT_THAT(d0, DoubleNear(1.0, 1.0));
166+ IUTEST_EXPECT_THAT(d0, FloatingPointNear(0.0, 0.0));
167+}
168+
169+#if IUTEST_HAS_LONG_DOUBLE
170+
171+IUTEST(Matcher, LongDoubleNear)
172+{
173+ IUTEST_EXPECT_THAT(ld0, LongDoubleNear(0.0, 0.0));
174+ long double ldx = 0.001;
175+ IUTEST_EXPECT_THAT(ld0, LongDoubleNear(ldx, ldx));
176+}
177+#endif
178+
161179 IUTEST(Matcher, NanSensitiveFloatNear)
162180 {
163181 IUTEST_EXPECT_THAT(f0, NanSensitiveFloatNear(0.0f, 0.0f));
@@ -176,14 +194,6 @@
176194
177195 #if IUTEST_HAS_LONG_DOUBLE
178196
179-IUTEST(Matcher, NanSensitiveLongDoubleEq)
180-{
181- IUTEST_EXPECT_THAT(ld0, NanSensitiveLongDoubleEq(0.0));
182- IUTEST_EXPECT_THAT(0.0/ld0, NanSensitiveLongDoubleEq(0.0/ld0));
183- long double ldx = 0.001;
184- IUTEST_EXPECT_THAT(ldx, NanSensitiveLongDoubleEq(0.001));
185-}
186-
187197 IUTEST(Matcher, NanSensitiveLongDoubleNear)
188198 {
189199 IUTEST_EXPECT_THAT(ld0, NanSensitiveLongDoubleNear(0.0, 0.0));
@@ -194,6 +204,8 @@
194204
195205 #endif
196206
207+#endif
208+
197209 IUTEST(Matcher, StrEq)
198210 {
199211 IUTEST_EXPECT_THAT("hoge", StrEq("hoge"));
@@ -493,6 +505,8 @@
493505
494506 #endif
495507
508+#if IUTEST_HAS_MATCHER_FLOATINGPOINT_NEAR
509+
496510 IUTEST(MatcherFailure, FloatNear)
497511 {
498512 CHECK_FAILURE( IUTEST_ASSERT_THAT(f0, FloatNear(1.0f, f0)), "Near: " );
@@ -538,6 +552,8 @@
538552
539553 #endif
540554
555+#endif
556+
541557 IUTEST(MatcherFailure, StrEq)
542558 {
543559 CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", StrEq("Hoge")), "StrEq: Hoge");
--- trunk/test/set_up_testcase_failure_tests.cpp (revision 1399)
+++ trunk/test/set_up_testcase_failure_tests.cpp (revision 1400)
@@ -62,11 +62,14 @@
6262 #endif
6363 const int ret = IUTEST_RUN_ALL_TESTS();
6464
65-#if defined(IUTEST_USE_GTEST) && GTEST_VER >= 0x01080100
65+#if defined(IUTEST_USE_GTEST) && (GTEST_VER >= 0x01080100 && GTEST_VER <= 0x01100000) && !GTEST_LATEST
6666 // "Google Test" fails to set up a test case,
6767 // it does not report a failure, and the test is also continued
68- if( ret == 1 ) return 1;
68+ // fixed at https://github.com/google/googletest/commit/9ed99c6c837ae1cbfcabd36959fc802ebb5ae07f
69+ IUTEST_ASSERT_EXIT( ret == 0 );
70+ if( ret != 0 ) return 1;
6971 #else
72+ IUTEST_ASSERT_EXIT( ret != 0 );
7073 if( ret == 0 ) return 1;
7174 #endif
7275
Show on old repository browser