Merge remote-tracking branch 'origin/develop'
git@5b609d6925255c240f0d32c1b7c7bdc47f24890b
https://github.com/srz-zumix/iutest/commit/5b609d6925255c240f0d32c1b7c7bdc47f24890b
Update LICENSE
git@6aee03547ba4899cfc5d6b3d993d00a15e959226
@@ -20,7 +20,7 @@ | ||
20 | 20 | #- cppcheck |
21 | 21 | |
22 | 22 | before_install: |
23 | - - python .ci/travisci/travis_blocking_stdout.py | |
23 | + - python .ci/travisci/travis_blocking_stdout.py || true | |
24 | 24 | #- apt-cache search clang || true |
25 | 25 | #- apt-cache search gcc || true |
26 | 26 | # compiler predefined specific |
@@ -41,8 +41,8 @@ | ||
41 | 41 | # clang |
42 | 42 | - | |
43 | 43 | if [ "${CXX}" = 'clang++' ] && [ "${TRAVIS_OS_NAME}" != 'osx' ]; then |
44 | - export CCC=clang-6.0; | |
45 | - export CXX=clang++-6.0; | |
44 | + export CCC=clang-6.0 | |
45 | + export CXX=clang++-6.0 | |
46 | 46 | #update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 90 |
47 | 47 | #update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 90 |
48 | 48 | fi |
@@ -57,7 +57,7 @@ | ||
57 | 57 | # gtest/gmock |
58 | 58 | - | |
59 | 59 | if [ "${USE_GTEST}" = '1' ] || [ "${USE_GMOCK}" = '1' ]; then |
60 | - if [ "${USE_GTEST_HEAD}" == '1' ]; then | |
60 | + if [ "${USE_GTEST_HEAD}" = '1' ]; then | |
61 | 61 | git clone https://github.com/google/googletest.git googletest |
62 | 62 | else |
63 | 63 | mkdir googletest |
@@ -93,9 +93,8 @@ | ||
93 | 93 | fi |
94 | 94 | |
95 | 95 | script: |
96 | - - if [ -n "${CUSTOM_COMMANDS}" ]; then echo "${CUSTOM_COMMANDS}" && eval ${CUSTOM_COMMANDS}; fi | |
97 | - - if [ "${USE_LIB}" == '1' ]; then cd projects/make && make && cd -; fi | |
98 | - - if [ "${USE_CMAKE}" == '1' ]; then | |
96 | + - if [ "${USE_LIB}" = '1' ]; then cd projects/make && make && cd -; fi | |
97 | + - if [ "${USE_CMAKE}" = '1' ]; then | |
99 | 98 | mkdir ./cmake-build && cd ./cmake-build && cmake ../projects/cmake && cmake --build . && ctest -C Debug -V && cd ..; |
100 | 99 | fi |
101 | 100 | - cd ./test |
@@ -103,10 +102,10 @@ | ||
103 | 102 | make -j4 showcxxversion ${USE_FUSED} default && make test ${USE_FUSED}; |
104 | 103 | fi |
105 | 104 | - | |
106 | - if [ "${COVERITY_SCAN}" == '1' ] && [ -d cov-int ]; then | |
107 | - cat cov-int/build-log.txt || true; | |
108 | - cat cov-int/scm_log.txt || true; | |
109 | - ls cov-int; | |
105 | + if [ "${COVERITY_SCAN}" = '1' ] && [ -d cov-int ]; then | |
106 | + cat cov-int/build-log.txt || true | |
107 | + cat cov-int/scm_log.txt || true | |
108 | + ls cov-int | |
110 | 109 | fi |
111 | 110 | #- if [ "${CPPCHECK}" = '1' ]; then |
112 | 111 | # cppcheck --version; |
@@ -117,7 +116,6 @@ | ||
117 | 116 | |
118 | 117 | after_success: |
119 | 118 | # Coverage |
120 | - #- echo ${TRAVIS_JOB_ID} | |
121 | 119 | - if [ "${USE_COVERALLS}" = '1' ]; then make send-coveralls; fi |
122 | 120 | - if [ "${USE_CODECOV}" = '1' ]; then make send-codecov; fi |
123 | 121 |
@@ -222,12 +220,19 @@ | ||
222 | 220 | # Use Lib |
223 | 221 | - compiler: gcc |
224 | 222 | env: USE_LIB=1 |
225 | -# - compiler: clang | |
226 | -# env: USE_LIB=1 | |
227 | - #- compiler: gcc | |
228 | - # env: CPPCHECK=1 | |
223 | + # - compiler: clang | |
224 | + # env: USE_LIB=1 | |
225 | + # - compiler: gcc | |
226 | + # env: CPPCHECK=1 | |
229 | 227 | - os: osx |
230 | 228 | env: OSX=1 STDFLAG=-std=c++11 |
229 | + - os: windows | |
230 | + env: WINDOWS=1 | |
231 | + script: | |
232 | + - mkdir ./cmake-build && cd ./cmake-build && cmake ../projects/cmake | |
233 | + - cmake --build . | tee msbuild.log | |
234 | + - ctest -C Debug -V | |
235 | + # CoverityScan | |
231 | 236 | - compiler: gcc |
232 | 237 | env: |
233 | 238 | - COVERITY_SCAN=1 |
@@ -10,6 +10,17 @@ | ||
10 | 10 | |
11 | 11 | -------------------------------------------------- |
12 | 12 | |
13 | +## Changes for 1.16.7 | |
14 | + | |
15 | +* Improved | |
16 | + * iuwandbox: コードサイズをさらに削減したヘッダーファイルに対応(--iutest-use-wandbox-min) | |
17 | + | |
18 | +* Bug fixes | |
19 | + * 古い google mock の互換性エラー修正 | |
20 | + * いくつかの不具合を修正 | |
21 | + | |
22 | +-------------------------------------------------- | |
23 | + | |
13 | 24 | ## Changes for 1.16.6 |
14 | 25 | |
15 | 26 | * Improved |
@@ -120,6 +120,11 @@ | ||
120 | 120 | * @page CHANGELOG 変更履歴 |
121 | 121 | * @par Changes |
122 | 122 | <ul> |
123 | + <li>v1.16.7.0 | |
124 | + <ul> | |
125 | + <li>古い google mock の互換性エラー修正</li> | |
126 | + </ul> | |
127 | + </li> | |
123 | 128 | <li>v1.16.6.0 |
124 | 129 | <ul> |
125 | 130 | <li>Matcher に (NanSensitive)FloatNear/DoubleNear を追加</li> |