• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1403 (tree)
Zeit2020-02-15 17:22:42
Autorsrz_zumix

Log Message

Merge pull request #377 from srz-zumix/develop

Update CI Configs
git@335f36bc22ceae72ae4d275fdd80728ef311619b
https://github.com/srz-zumix/iutest/commit/335f36bc22ceae72ae4d275fdd80728ef311619b


update issue template

git@596905b74498f66c17cd908abe451d70b3b5c7c3

Ändern Zusammenfassung

Diff

--- trunk/rocro.yml (revision 1402)
+++ trunk/rocro.yml (nonexistent)
@@ -1,79 +0,0 @@
1-inspecode:
2- cpplint:
3- input:
4- - include/**
5- - src/**
6- options:
7- --linelength: 150
8- --headers: hpp,ipp
9- --extensions: hpp,ipp,cpp
10- --filter:
11- -build/c++11,
12- -build/c++tr1,
13- -build/header_guard,
14- -build/include_what_you_use,
15- -readability/braces,
16- -readability/todo,
17- -runtime/int,
18- -runtime/references,
19- -whitespace/braces,
20- -whitespace/comments,
21- -whitespace/indent,
22- -whitespace/newline,
23- -whitespace/operators,
24- -whitespace/parens
25- thresholds:
26- num-issues: 0
27-
28- cppcheck:
29- options:
30- --enable: all
31- -I: include
32- -D:
33- - IUTEST_HAS_CLOCK=1
34- - IUTEST_HAS_TESTNAME_ALIAS_JP=0
35- -U:
36- - _WIN32
37- - _MSC_VER
38- - __clang__
39- - __CYGWIN__
40- - __APPLE__
41- --platform: unix64
42- --inline-suppr:
43- --suppress:
44- - syntaxError
45- - unusedFunction
46- - "knownConditionTrueFalse:*/iutest_internal_defs.hpp"
47- - "noExplicitConstructor:*/iutest_defs.hpp"
48- - "noExplicitConstructor:*/iutest_any.hpp"
49- - "noExplicitConstructor:*/iutest_string_view.hpp"
50- - "unusedPrivateFunction:*/iutest_console.hpp"
51- - "unusedPrivateFunction:*/iutest_expression_assertion.hpp"
52- - "unusedStructMember:*/iutest_constant.hpp"
53- - "unusedStructMember:*/iutest_defs.hpp"
54- - "unusedStructMember:*/iutest_type_traits.hpp"
55- - "preprocessorErrorDirective:*/iutest_param_tests.hpp" # IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE negative failure
56- - unmatchedSuppression
57- --max-configs: 20
58- #--force:
59- ignore:
60- - test/spi_tests_decl.cpp
61- - test/benchmark/*.cpp
62- - test/japanese_tests.cpp # unhandled character(s)
63- - samples/japanese.cpp # unhandled character(s)
64- - tools/paiza.io/*.cpp
65- - tools/wandbox/*.cpp
66- - projects/**/*.c
67- - projects/**/*.cpp
68- thresholds:
69- num-issues:
70- #information: 0
71- style: 0
72- performance: 0
73- portability: 0
74-
75- scan-build:
76- options:
77- - -analyze-headers
78- - -k
79- - --: [make, -C, test, syntax_tests]
--- trunk/.travis.yml (revision 1402)
+++ trunk/.travis.yml (revision 1403)
@@ -31,6 +31,7 @@
3131 retries: true
3232
3333 before_install:
34+ # コアダンプ出力のセットアップ
3435 - |
3536 if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
3637 ulimit -c unlimited
@@ -226,7 +227,7 @@
226227 env: WINDOWS=1
227228 script:
228229 - mkdir ./cmake-build && cd ./cmake-build && cmake ../projects/cmake
229- - cmake --build . | tee msbuild.log
230+ - cmake --build .
230231 - ctest -C Debug -V
231232 # CoverityScan
232233 - compiler: gcc
--- trunk/CHANGES.md (revision 1402)
+++ trunk/CHANGES.md (revision 1403)
@@ -2,11 +2,14 @@
22
33 --------------------------------------------------
44
5-## Changes for 1.17.0
5+## Changes for 1.17.1
66
77 * New
88 * GTEST_SKIP 対応
99
10+* Bug fixes
11+ * いくつかの不具合を修正
12+
1013 --------------------------------------------------
1114
1215 ## Changes for 1.17.0
--- trunk/README.md (revision 1402)
+++ trunk/README.md (revision 1403)
@@ -22,9 +22,7 @@
2222 [![Coveralls Coverage Status](https://coveralls.io/repos/github/srz-zumix/iutest/badge.svg?branch=master)](https://coveralls.io/github/srz-zumix/iutest?branch=master)
2323 [![Coverity Scan Build Status](https://scan.coverity.com/projects/1316/badge.svg)](https://scan.coverity.com/projects/srz-zumix-iutest)
2424 [![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%20-%20reviewdog/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions+-+reviewdog%22)
26-[![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)
27-[![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)
25+[![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)
2826 [![New(3-clause) BSD License](https://img.shields.io/badge/license-New_BSD-blue.svg)](http://opensource.org/licenses/BSD-3-Clause)
2927 [![NuGet version](https://badge.fury.io/nu/iutest.svg)](https://badge.fury.io/nu/iutest)
3028 [![support](https://img.shields.io/badge/%24-support-orange.svg)](http://amzn.asia/6fNxDZU)
@@ -128,11 +126,10 @@
128126 |[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|
129127 |[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)|
130128 |[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)|
131-|[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|
132129 |[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)||
133130 |[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|
134131 |[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|
132+|[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, Basic test, sample run|
136133 |[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)|
137134 |[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|
138135 |[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)|
--- trunk/appveyor.yml (revision 1402)
+++ trunk/appveyor.yml (revision 1403)
@@ -19,36 +19,14 @@
1919 # Cygwin
2020 - BUILD_CYGWIN: yes
2121 USE_GNU_EXTENSION: 0
22- CYGWIN_PATH: C:\cygwin
23- CYGWIN_SETUP_EXE: setup-x86.exe
2422 - BUILD_CYGWIN: yes
2523 USE_GNU_EXTENSION: 1
26- CYGWIN_PATH: C:\cygwin
27- CYGWIN_SETUP_EXE: setup-x86.exe
28- - BUILD_CYGWIN: yes
29- USE_GNU_EXTENSION: 1
30- CYGWIN_PATH: C:\cygwin64
31- CYGWIN_SETUP_EXE: setup-x86_64.exe
32- # MINGW64
24+ # MINGW/MINGW64
3325 - BUILD_MINGW: yes
3426 USE_GNU_EXTENSION: 0
35- MAKE_OPTIONS: LIBS=ws2_32
36- MINGW_PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
37- #MINGW_PATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1
38- #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
39- # MINGW64 GNU EXTENSION
27+ # MINGW/MINGW64 GNU EXTENSION
4028 - BUILD_MINGW: yes
4129 USE_GNU_EXTENSION: 1
42- MAKE_OPTIONS: LIBS=ws2_32
43- MINGW_PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
44- # MINGW32
45- - BUILD_MINGW: yes
46- USE_GNU_EXTENSION: 0
47- MINGW_PATH: c:\mingw\bin
48- # MINGW32 GNU EXTENSION
49- - BUILD_MINGW: yes
50- USE_GNU_EXTENSION: 1
51- MINGW_PATH: c:\mingw\bin
5230 # NMAKE
5331 - BUILD_NMAKE: yes
5432 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
@@ -57,7 +35,7 @@
5735 PROJECT_DIR: vs2015
5836 # Menu
5937 - BUILD_MENU: yes
60- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
38+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
6139 # Package Build
6240 - BUILD_PACKAGE: yes
6341 APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
@@ -67,6 +45,9 @@
6745 configuration:
6846 - Debug
6947 - Release
48+platform:
49+ - Win32
50+ - x64
7051
7152 matrix:
7253 exclude:
@@ -84,6 +65,15 @@
8465 BUILD_PACKAGE: yes
8566 - configuration: Debug
8667 BUILD_NUGET: yes
68+ # exclude x64
69+ - platform: x64
70+ BUILD_NMAKE: yes
71+ - platform: x64
72+ BUILD_PREFAST: yes
73+ - platform: x64
74+ BUILD_PACKAGE: yes
75+ - platform: x64
76+ BUILD_NUGET: yes
8777
8878 branches:
8979 only:
@@ -99,6 +89,7 @@
9989 clone_depth: 1
10090
10191 init:
92+ # RDP setup
10293 ps: |
10394 $commit_message = $env:APPVEYOR_REPO_COMMIT_MESSAGE
10495 if($commit_message.Contains("[appveyor rdp]")) {
@@ -112,7 +103,7 @@
112103 before_build:
113104 cmd: |
114105 mkdir build && cd build
115- cmake ../projects/cmake -G "%CMAKE_GENERATOR_NAME%" -Dbuild_gtest_samples=ON
106+ cmake ../projects/cmake -G "%CMAKE_GENERATOR_NAME%" -A %PLATFORM% -Dbuild_gtest_samples=ON
116107 cd ..
117108
118109 build:
@@ -123,6 +114,14 @@
123114 test_script:
124115 cmd: cd build && ctest -C %Configuration% -V
125116
117+on_failure:
118+ # wait RDP connect
119+ ps: |
120+ $commit_message = $env:APPVEYOR_REPO_COMMIT_MESSAGE
121+ if($commit_message.Contains("[appveyor rdp]")) {
122+ $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
123+ }
124+
126125 for:
127126 # Build .sln (no cmake)
128127 -
@@ -143,18 +142,29 @@
143142 -
144143 matrix:
145144 only:
146- - configuration: Release
147- BUILD_CYGWIN: yes
145+ - BUILD_CYGWIN: yes
146+ init:
147+ ps: |
148+ if($env:PLATFORM -eq "Win32"){
149+ $env:CYGWIN_PATH="C:\cygwin"
150+ $env:CYGWIN_SETUP_EXE="setup-x86.exe"
151+ } else {
152+ $env:CYGWIN_PATH="C:\cygwin64"
153+ $env:CYGWIN_SETUP_EXE="setup-x86_64.exe"
154+ }
155+ $env:PATH=$env:CYGWIN_PATH + "\bin;" + $env:PATH
148156 install:
149157 cmd: |
150158 %CYGWIN_PATH%\%CYGWIN_SETUP_EXE% -qnNdO -R %CYGWIN_PATH% -s http://cygwin.mirror.constant.com -l %CYGWIN_PATH%/var/cache/setup -P make -P clang
151159 SET PATH=%CYGWIN_PATH%\bin;%PATH%
152160 before_build:
153- cmd: echo.
161+ cmd: |
162+ g++ --version
163+ clang++ --version
164+ python --version
154165 build_script:
155166 cmd: |
156167 cd test
157- g++ --version; clang++ --version; python --version
158168 make showcxxmacros
159169 uname
160170 make -j4
@@ -164,10 +174,16 @@
164174 -
165175 matrix:
166176 only:
167- - configuration: Release
168- BUILD_MINGW: yes
177+ - BUILD_MINGW: yes
169178 install:
170- cmd: set path=%MINGW_PATH%;%path%
179+ ps: |
180+ if($env:PLATFORM -eq "Win32"){
181+ $env:MAKE_OPTIONS="LIBS=ws2_32"
182+ $env:MINGW_PATH="C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin"
183+ } else {
184+ $env:MINGW_PATH="C:\mingw\bin"
185+ }
186+ $env:PATH=$env:MINGW_PATH + ";" + $env:PATH
171187 before_build:
172188 cmd: echo.
173189 build_script:
@@ -182,8 +198,7 @@
182198 -
183199 matrix:
184200 only:
185- - configuration: Release
186- BUILD_NMAKE: yes
201+ - BUILD_NMAKE: yes
187202 before_build:
188203 cmd: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\vsdevcmd.bat"'
189204 build_script:
@@ -194,8 +209,7 @@
194209 -
195210 matrix:
196211 only:
197- - configuration: Debug
198- BUILD_PREFAST: yes
212+ - BUILD_PREFAST: yes
199213 environment:
200214 MSBUILD_LOGGER_OPTION: /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
201215 MSBUILD_PREFAST_OPTION: /p:RunCodeAnalysis=true /p:EnablePREfast=true /p:CodeAnalysisTreatWarningsAsErrors=true
@@ -208,8 +222,7 @@
208222 -
209223 matrix:
210224 only:
211- - configuration: Release
212- BUILD_MENU: yes
225+ - BUILD_MENU: yes
213226 before_build:
214227 cmd: echo.
215228 build:
@@ -221,8 +234,7 @@
221234 -
222235 matrix:
223236 only:
224- - configuration: Release
225- BUILD_PACKAGE: yes
237+ - BUILD_PACKAGE: yes
226238 before_build:
227239 cmd: echo.
228240 build_script:
@@ -232,8 +244,7 @@
232244 -
233245 matrix:
234246 only:
235- - configuration: Release
236- BUILD_NUGET: yes
247+ - BUILD_NUGET: yes
237248 before_build:
238249 cmd: echo.
239250 build_script:
@@ -243,14 +254,6 @@
243254 nuget pack $nuspecPath -OutputDirectory ".\"
244255 test: off
245256
246-on_failure:
247- ps: |
248- # rdp
249- $commit_message = $env:APPVEYOR_REPO_COMMIT_MESSAGE
250- if($commit_message.Contains("[appveyor rdp]")) {
251- $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
252- }
253-
254257 notifications:
255258 - provider: Email
256259 to:
Show on old repository browser