• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1330 (tree)
Time2018-08-03 09:48:33
Authorsrz_zumix

Log Message

Merge branch 'develop'

git@d9a4af458d098791ee8f2e7ff6698a2945e192b6
https://github.com/srz-zumix/iutest/commit/d9a4af458d098791ee8f2e7ff6698a2945e192b6

Change Summary

Incremental Difference

--- trunk/CHANGES.md (revision 1329)
+++ trunk/CHANGES.md (revision 1330)
@@ -2,6 +2,21 @@
22
33 --------------------------------------------------
44
5+## Changes for 1.16.5
6+
7+* Improved
8+ * IUTEST_*_NULL, IUTEST_*_NOTNULL を可変長引数対応
9+ * IUTEST_*_HRESULT_SUCCEEDED, IUTEST_*_HRESULT_FAILED を可変長引数対応
10+ * compatibility: iuutil に ad_hoc_testresult の取得関数を追加
11+
12+* Changes
13+ * ad_hoc_testresult の取得関数名を ad_hoc_test_result に変更
14+
15+* Bug fixes
16+ * iuwandbox: iuwandbox で std-cxx の指定をするとオプションチェックで失敗する不具合を修正
17+
18+--------------------------------------------------
19+
520 ## Changes for 1.16.4
621
722 * 変更
--- trunk/README.md (revision 1329)
+++ trunk/README.md (revision 1330)
@@ -103,14 +103,12 @@
103103
104104 |CI|master|develop|Tests|
105105 |:--|:--|:--|:--|
106-|Travis CI |[![Travis-CI Build Status](https://travis-ci.org/srz-zumix/iutest.svg?branch=master)](https://travis-ci.org/srz-zumix/iutest)|[![Travis-CI Build Status](https://travis-ci.org/srz-zumix/iutest.svg?branch=develop)](https://travis-ci.org/srz-zumix/iutest)|Basic tests, Google test compatibility, Coverage, Coverity-scan|
107-|AppVeyor |[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/2gdmgo8ce8m0iy0e/branch/master?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest/branch/master)|[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/2gdmgo8ce8m0iy0e/branch/develop?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest/branch/develop)|Windows, NuGet|
106+|Travis CI |[![Travis-CI Build Status](https://travis-ci.org/srz-zumix/iutest.svg?branch=master)](https://travis-ci.org/srz-zumix/iutest)|[![Travis-CI Build Status](https://travis-ci.org/srz-zumix/iutest.svg?branch=develop)](https://travis-ci.org/srz-zumix/iutest)|Basic tests, Google Test compatibility, Coverage, Coverity-scan|
107+|AppVeyor |[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/2gdmgo8ce8m0iy0e/branch/master?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest/branch/master)|[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/2gdmgo8ce8m0iy0e/branch/develop?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest/branch/develop)|Windows, Visual Studio, Cygwin, MINGW, NuGet|
108108 | |[![AppVeyor Build PREFAST status](https://ci.appveyor.com/api/projects/status/0w0wuhc58kre178q/branch/master?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest-xsqun/branch/master)|[![AppVeyor Build PREFAST status](https://ci.appveyor.com/api/projects/status/0w0wuhc58kre178q/branch/develop?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest-xsqun/branch/develop)|Visual Studio PREFAST (Code Analysis)|
109-| |[![AppVeyor Build cygwin status](https://ci.appveyor.com/api/projects/status/erhkn5rer20jmdbq/branch/master?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest-xlae4/branch/master)|[![AppVeyor Build cygwin status](https://ci.appveyor.com/api/projects/status/erhkn5rer20jmdbq/branch/develop?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest-xlae4/branch/develop)|Cygwin|
110-| |[![AooVeyor Build mingw status](https://ci.appveyor.com/api/projects/status/xr7yvj6swxutluu4/branch/master?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest-rbhes/branch/master)|[![AppVeyor Build mingw status](https://ci.appveyor.com/api/projects/status/xr7yvj6swxutluu4/branch/develop?svg=true)](https://ci.appveyor.com/project/srz-zumix/iutest-rbhes/branch/develop)|MinGW|
111109 |Wercker |[![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|
112110 |Shippable |[![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)|
113-|Codeship |[![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)|Cpplint, Update documents|
111+|Codeship |[![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|
114112 |Semaphore |[![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|
115113 |Codefresh |[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=master&pipelineName=iutest_gtest&accountName=srz-zumix&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:master;service:58a933be9d1bd40100495882~iutest_gtest)|[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=develop&pipelineName=iutest_gtest&accountName=srz-zumix&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:develop;service:58a933be9d1bd40100495882~iutest_gtest)|Google Test compatibility (HEAD)|
116114 | |[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=master&pipelineName=iutest_gmock&accountName=srz-zumix&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:master;service:5988fd7df61a9b000176f0a3~iutest_gmock)|[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=develop&pipelineName=iutest_gmock&accountName=srz-zumix&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:develop;service:5988fd7df61a9b000176f0a3~iutest_gmock)|Google Mock compatibility (HEAD)|
--- trunk/appveyor.yml (revision 1329)
+++ trunk/appveyor.yml (revision 1330)
@@ -10,17 +10,51 @@
1010 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
1111 PROJECT_DIR: msvc15
1212 CMAKE_GENERATOR_NAME: Visual Studio 15 2017
13+ - BUILD_CYGWIN: yes
14+ USE_GNU_EXTENSION: 0
15+ - BUILD_CYGWIN: yes
16+ USE_GNU_EXTENSION: 1
17+ - BUILD_MINGW: yes
18+ MINGW_PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
19+ #MINGW_PATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1
20+ MAKE_OPTIONS: LIBS=ws2_32
21+ #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
22+ # MINGW32
23+ - BUILD_MINGW: yes
24+ #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
25+ MINGW_PATH: c:\mingw\bin
26+ - BUILD_NUGET: yes
1327
1428 configuration:
1529 - Debug
1630 - Release
1731
32+matrix:
33+ exclude:
34+ - configuration: Debug
35+ BUILD_NUGET: yes
36+ - configuration: Debug
37+ BUILD_CYGWIN: yes
38+ - configuration: Debug
39+ BUILD_MINGW: yes
40+
41+clone_depth: 1
42+
43+init:
44+ ps: |
45+ $commit_message = $env:APPVEYOR_REPO_COMMIT_MESSAGE
46+ if($commit_message.Contains("[appveyor rdp]")) {
47+ iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
48+ Set-WinSystemLocale ja-JP
49+ Set-Location -Path hklm:\SYSTEM\CurrentControlSet\Control
50+ New-ItemProperty -Path ".\Keyboard Layout" -Name IgnoreRemoteKeyboardLayout -PropertyType DWORD -Value 1 -Force
51+ Restart-Computer
52+ }
53+
1854 before_build:
19- - cmd: >-
55+ cmd: |
2056 mkdir build && cd build
21-
2257 cmake ../projects/cmake -G "%CMAKE_GENERATOR_NAME%" -Dbuild_gtest_samples=ON
23-
2458 cd ..
2559
2660 build:
@@ -29,11 +63,76 @@
2963 verbosity: minimal
3064
3165 test_script:
32- - cmd: >-
66+ cmd: |
3367 cd build
34-
3568 ctest -C %Configuration% -V
3669
70+for:
71+# NuGet
72+-
73+ matrix:
74+ only:
75+ - configuration: Release
76+ BUILD_NUGET: yes
77+ before_build:
78+ cmd: echo.
79+ build_script:
80+ ps: |
81+ $nuspecPath = "projects\nuget\iutest.nuspec"
82+ Write-Output "Building NuGet package"
83+ nuget pack $nuspecPath -OutputDirectory ".\"
84+ test: off
85+# Cygwin
86+-
87+ matrix:
88+ only:
89+ - configuration: Release
90+ BUILD_CYGWIN: yes
91+ install:
92+ cmd: |
93+ c:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P make -P clang
94+ SET PATH=%PATH%;c:\cygwin\bin
95+ before_build:
96+ cmd: echo.
97+ build_script:
98+ cmd: |
99+ cd test
100+ g++ --version; clang++ --version; python --version
101+ @echo. > foo.h && g++ -std=c++1z -dM -E -x c++ foo.h
102+ uname
103+ make
104+ test_script:
105+ cmd: |
106+ make test
107+# MINGW
108+-
109+ matrix:
110+ only:
111+ - configuration: Release
112+ BUILD_MINGW: yes
113+ install:
114+ cmd: set path=%MINGW_PATH%;%path%
115+ before_build:
116+ cmd: echo.
117+ build_script:
118+ cmd: |
119+ cd test
120+ g++ --version
121+ @echo. > foo.h && g++ -std=c++1z -dM -E -x c++ foo.h
122+ mingw32-make USE_GNU_EXTENSION=1 %MAKE_OPTIONS%
123+ mingw32-make clean
124+ mingw32-make %MAKE_OPTIONS%
125+ test_script:
126+ cmd: mingw32-make test %MAKE_OPTIONS%
127+
128+on_failure:
129+ ps: |
130+ # rdp
131+ $commit_message = $env:APPVEYOR_REPO_COMMIT_MESSAGE
132+ if($commit_message.Contains("[appveyor rdp]")) {
133+ $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
134+ }
135+
37136 notifications:
38137 - provider: Email
39138 to:
Show on old repository browser