• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1351 (tree)
Time2018-10-27 23:02:58
Authorsrz_zumix

Log Message

Merge remote-tracking branch 'origin/develop'

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


Update LICENSE
git@6aee03547ba4899cfc5d6b3d993d00a15e959226

Change Summary

Incremental Difference

--- trunk/.travis.yml (revision 1350)
+++ trunk/.travis.yml (revision 1351)
@@ -20,7 +20,7 @@
2020 #- cppcheck
2121
2222 before_install:
23- - python .ci/travisci/travis_blocking_stdout.py
23+ - python .ci/travisci/travis_blocking_stdout.py || true
2424 #- apt-cache search clang || true
2525 #- apt-cache search gcc || true
2626 # compiler predefined specific
@@ -41,8 +41,8 @@
4141 # clang
4242 - |
4343 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
4646 #update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 90
4747 #update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 90
4848 fi
@@ -57,7 +57,7 @@
5757 # gtest/gmock
5858 - |
5959 if [ "${USE_GTEST}" = '1' ] || [ "${USE_GMOCK}" = '1' ]; then
60- if [ "${USE_GTEST_HEAD}" == '1' ]; then
60+ if [ "${USE_GTEST_HEAD}" = '1' ]; then
6161 git clone https://github.com/google/googletest.git googletest
6262 else
6363 mkdir googletest
@@ -93,9 +93,8 @@
9393 fi
9494
9595 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
9998 mkdir ./cmake-build && cd ./cmake-build && cmake ../projects/cmake && cmake --build . && ctest -C Debug -V && cd ..;
10099 fi
101100 - cd ./test
@@ -103,10 +102,10 @@
103102 make -j4 showcxxversion ${USE_FUSED} default && make test ${USE_FUSED};
104103 fi
105104 - |
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
110109 fi
111110 #- if [ "${CPPCHECK}" = '1' ]; then
112111 # cppcheck --version;
@@ -117,7 +116,6 @@
117116
118117 after_success:
119118 # Coverage
120- #- echo ${TRAVIS_JOB_ID}
121119 - if [ "${USE_COVERALLS}" = '1' ]; then make send-coveralls; fi
122120 - if [ "${USE_CODECOV}" = '1' ]; then make send-codecov; fi
123121
@@ -222,12 +220,19 @@
222220 # Use Lib
223221 - compiler: gcc
224222 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
229227 - os: osx
230228 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
231236 - compiler: gcc
232237 env:
233238 - COVERITY_SCAN=1
--- trunk/CHANGES.md (revision 1350)
+++ trunk/CHANGES.md (revision 1351)
@@ -10,6 +10,17 @@
1010
1111 --------------------------------------------------
1212
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+
1324 ## Changes for 1.16.6
1425
1526 * Improved
--- trunk/include/iutest_ver.hpp (revision 1350)
+++ trunk/include/iutest_ver.hpp (revision 1351)
@@ -120,6 +120,11 @@
120120 * @page CHANGELOG 変更履歴
121121 * @par Changes
122122 <ul>
123+ <li>v1.16.7.0
124+ <ul>
125+ <li>古い google mock の互換性エラー修正</li>
126+ </ul>
127+ </li>
123128 <li>v1.16.6.0
124129 <ul>
125130 <li>Matcher に (NanSensitive)FloatNear/DoubleNear を追加</li>
Show on old repository browser