Merge branch 'develop'

CHANGES.md

@@ -2,6 +2,21 @@
 
 --------------------------------------------------
 
+## Changes for 1.16.5
+
+* Improved
+  * IUTEST_*_NULL, IUTEST_*_NOTNULL を可変長引数対応
+  * IUTEST_*_HRESULT_SUCCEEDED, IUTEST_*_HRESULT_FAILED を可変長引数対応
+  * compatibility: iuutil に ad_hoc_testresult の取得関数を追加
+
+* Changes
+  * ad_hoc_testresult の取得関数名を ad_hoc_test_result に変更
+
+* Bug fixes
+  * iuwandbox: iuwandbox で std-cxx の指定をするとオプションチェックで失敗する不具合を修正
+
+--------------------------------------------------
+
 ## Changes for 1.16.4
 
 * 変更

README.md

@@ -103,14 +103,12 @@ Tests
 
 |CI|master|develop|Tests|
 |:--|:--|:--|:--|
-|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|
-|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|
+|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|
+|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|
 |           |[![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)|
-|           |[![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|
-|           |[![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|
 |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|
 |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)|
-|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|
+|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|
 |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|
 |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)|
 |           |[![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)|

appveyor.yml

@@ -10,17 +10,51 @@ environment:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PROJECT_DIR: msvc15
       CMAKE_GENERATOR_NAME: Visual Studio 15 2017
+    - BUILD_CYGWIN: yes
+      USE_GNU_EXTENSION: 0
+    - BUILD_CYGWIN: yes
+      USE_GNU_EXTENSION: 1
+    - BUILD_MINGW: yes
+      MINGW_PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
+      #MINGW_PATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1
+      MAKE_OPTIONS: LIBS=ws2_32
+      #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    # MINGW32 
+    - BUILD_MINGW: yes
+      #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      MINGW_PATH: c:\mingw\bin
+    - BUILD_NUGET: yes
 
 configuration:
   - Debug
   - Release
 
+matrix:
+  exclude:
+    - configuration: Debug
+      BUILD_NUGET: yes
+    - configuration: Debug
+      BUILD_CYGWIN: yes
+    - configuration: Debug
+      BUILD_MINGW: yes
+
+clone_depth: 1
+
+init:
+  ps: |
+    $commit_message = $env:APPVEYOR_REPO_COMMIT_MESSAGE
+    if($commit_message.Contains("[appveyor rdp]")) {
+        iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+        Set-WinSystemLocale ja-JP
+        Set-Location -Path hklm:\SYSTEM\CurrentControlSet\Control
+        New-ItemProperty -Path ".\Keyboard Layout" -Name IgnoreRemoteKeyboardLayout -PropertyType DWORD -Value 1 -Force
+        Restart-Computer
+    }
+
 before_build:
-  - cmd: >-
+  cmd: |
       mkdir build && cd build
-
       cmake ../projects/cmake -G "%CMAKE_GENERATOR_NAME%" -Dbuild_gtest_samples=ON
-
       cd ..
 
 build:
@@ -29,11 +63,76 @@ build:
   verbosity: minimal
 
 test_script:
-  - cmd: >-
+  cmd: |
       cd build
-
       ctest -C %Configuration% -V
 
+for:
+# NuGet
+-
+  matrix:
+    only:
+      - configuration: Release
+        BUILD_NUGET: yes
+  before_build:
+    cmd: echo.
+  build_script:
+    ps: |
+      $nuspecPath = "projects\nuget\iutest.nuspec"
+      Write-Output "Building NuGet package"
+      nuget pack $nuspecPath -OutputDirectory ".\"
+  test: off
+# Cygwin
+-
+  matrix:
+    only:
+      - configuration: Release
+        BUILD_CYGWIN: yes
+  install:
+    cmd: |
+      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
+      SET PATH=%PATH%;c:\cygwin\bin
+  before_build:
+    cmd: echo.
+  build_script:
+    cmd: |
+      cd test
+      g++ --version; clang++ --version; python --version
+      @echo. > foo.h && g++ -std=c++1z -dM -E -x c++ foo.h
+      uname
+      make
+  test_script:
+    cmd: |
+      make test
+# MINGW
+-
+  matrix:
+    only:
+      - configuration: Release
+        BUILD_MINGW: yes
+  install:
+    cmd: set path=%MINGW_PATH%;%path%
+  before_build:
+    cmd: echo.
+  build_script:
+    cmd: |
+      cd test
+      g++ --version
+      @echo. > foo.h && g++ -std=c++1z -dM -E -x c++ foo.h
+      mingw32-make USE_GNU_EXTENSION=1 %MAKE_OPTIONS%
+      mingw32-make clean
+      mingw32-make %MAKE_OPTIONS%
+  test_script:
+    cmd: mingw32-make test %MAKE_OPTIONS%
+
+on_failure:
+  ps: |
+    # rdp
+    $commit_message = $env:APPVEYOR_REPO_COMMIT_MESSAGE
+    if($commit_message.Contains("[appveyor rdp]")) {
+      $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+    }
+
 notifications:
   - provider: Email
     to:

projects/nuget/iutest.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>iutest</id>
     <title>iutest</title>
-    <version>1.16.4</version>
+    <version>1.16.5</version>
     <authors>Takazumi Shirayanagi</authors>
     <copyright>Copyright (c) 2011-2018</copyright>
     <summary>C++ testing framework.</summary>