• R/O
  • SSH
  • HTTPS

iutest: コミット


コミットメタ情報

リビジョン1362 (tree)
日時2019-01-05 17:19:09
作者srz_zumix

ログメッセージ

Merge remote-tracking branch 'origin/develop'

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

変更サマリ

差分

--- trunk/CHANGES.md (revision 1361)
+++ trunk/CHANGES.md (revision 1362)
@@ -7,6 +7,7 @@
77 * Improved
88
99 * Changes
10+ * junit xml 出力で出力するテストが 0 だった場合にファイル書き出ししないように修正
1011 * CSV パラメータ生成でファイルオープン失敗した場合の警告レベルを FATAL から WARNING に変更
1112 * CSV パラメータ生成で要素がなかった場合に WARNING 出力
1213 * deprecated: IUTEST_USE_OWN_LIST
--- trunk/README.md (revision 1361)
+++ trunk/README.md (revision 1362)
@@ -119,7 +119,7 @@
119119 |[Codefresh](https://codefresh.io/)||||
120120 |[Codeship](https://codeship.com/)|[![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|
121121 |[Coverity Scan](https://codeship.com/)|[![Coverity Scan Build Status](https://scan.coverity.com/projects/1316/badge.svg)](https://scan.coverity.com/projects/srz-zumix-iutest)||Coverity Scan|
122-[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)||Google Test/Google Mock compatibility (HEAD)|
122+[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)|
123123 |[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|
124124 |[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|
125125 |[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|
--- trunk/buddy.yml (revision 1361)
+++ trunk/buddy.yml (revision 1362)
@@ -1,3 +1,15 @@
1+- .gtest-version-action-template: &gtest-version-action-template
2+ type: "BUILD"
3+ working_directory: "/buddy/iutest"
4+ docker_image_name: "srzzumix/googletest"
5+ execute_commands:
6+ - "cd test"
7+ - "make USE_GTEST=1 ${MAKE_OPTION} gtest-version"
8+ - "make USE_GTEST=1 USE_GMOCK=1 ${MAKE_OPTION} gtest-version"
9+ mount_filesystem_path: "/buddy/iutest"
10+ shell: "SH"
11+ trigger_condition: "ALWAYS"
12+
113 - pipeline: "build-arm-none-eabi"
214 trigger_mode: "ON_EVERY_PUSH"
315 ref_name: "(^(master|develop)*$)"
@@ -39,10 +51,12 @@
3951 working_directory: "/buddy/iutest"
4052 docker_image_name: "srzzumix/googletest"
4153 docker_image_tag: "latest"
54+ setup_commands:
55+ - "export MAKE_OPTION=\"GTEST_EXPECT_VER=0x01080100 GTEST_EXPECT_LATEST=1\""
4256 execute_commands:
4357 - "cd test"
44- - "make USE_GTEST=1 GTEST_EXPECT_VER=0x01080100 GTEST_EXPECT_LATEST=1 gtest-version"
45- - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=0x01080100 GTEST_EXPECT_LATEST=1 gtest-version"
58+ - "make USE_GTEST=1 ${MAKE_OPTION} gtest-version"
59+ - "make USE_GTEST=1 USE_GMOCK=1 ${MAKE_OPTION} gtest-version"
4660 mount_filesystem_path: "/buddy/iutest"
4761 shell: "SH"
4862 trigger_condition: "ALWAYS"
--- trunk/include/gtest/iutest_switch_for_gtest.hpp (revision 1361)
+++ trunk/include/gtest/iutest_switch_for_gtest.hpp (revision 1362)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2018, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -350,6 +350,8 @@
350350
351351 #endif
352352
353+#if GTEST_VER <= 0x01080100 && !GTEST_LATEST
354+
353355 namespace internal
354356 {
355357
@@ -358,6 +360,8 @@
358360
359361 } // end of namespace internal
360362
363+#endif
364+
361365 // ostream
362366 typedef ::std::ostream iu_ostream;
363367
--- trunk/include/gtest/switch/iutest_switch_cmphelper.hpp (revision 1361)
+++ trunk/include/gtest/switch/iutest_switch_cmphelper.hpp (revision 1362)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2012-2016, Takazumi Shirayanagi\n
9+ * Copyright (C) 2012-2019, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -28,6 +28,10 @@
2828 namespace internal
2929 {
3030
31+#if GTEST_VER > 0x01080100 || GTEST_LATEST
32+using ::std::is_pointer;
33+#endif
34+
3135 #if GTEST_MINORVER < 0x06
3236 template<bool> struct EnableIf;
3337 template<> struct EnableIf<true> { typedef void type; };
--- trunk/include/gtest/switch/iutest_switch_core.hpp (revision 1361)
+++ trunk/include/gtest/switch/iutest_switch_core.hpp (revision 1362)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2012-2018, Takazumi Shirayanagi\n
9+ * Copyright (C) 2012-2019, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -140,12 +140,20 @@
140140 #define IUTEST_P TEST_P
141141 #define IUTEST_INSTANTIATE_TEST_CASE_P INSTANTIATE_TEST_CASE_P
142142
143+#if !defined(GTEST_SUITE_NAMESPACE_)
144+# if defined(GTEST_CASE_NAMESPACE_)
145+# define GTEST_SUITE_NAMESPACE_ GTEST_CASE_NAMESPACE_
146+# else
147+# define GTEST_SUITE_NAMESPACE_(TestSuiteName) gtest_suite_##TestSuiteName##_
148+# endif
149+#endif
150+
143151 #define IUTEST_FRIEND_TEST FRIEND_TEST
144152 #define IUTEST_FRIEND_TYPED_TEST template<typename T>FRIEND_TEST
145153 #define IUTEST_FRIEND_TYPED_TEST_P_DECLARATION(test_case_name, test_name) \
146- namespace GTEST_CASE_NAMESPACE_(test_case_name) { template<typename T>class test_name; }
154+ namespace GTEST_SUITE_NAMESPACE_(test_case_name) { template<typename T>class test_name; }
147155 #define IUTEST_FRIEND_TYPED_TEST_P(test_case_name, test_name) \
148- template<typename T>friend class GTEST_CASE_NAMESPACE_(test_case_name)::test_name
156+ template<typename T>friend class GTEST_SUITE_NAMESPACE_(test_case_name)::test_name
149157 #define IUTEST_SCOPED_TRACE SCOPED_TRACE
150158 #define IUTEST_FLAG GTEST_FLAG
151159
--- trunk/include/internal/iutest_type_traits.hpp (revision 1361)
+++ trunk/include/internal/iutest_type_traits.hpp (revision 1362)
@@ -22,7 +22,7 @@
2222 //======================================================================
2323 // define
2424 #ifndef IUTEST_HAS_HDR_TYPETARITS
25-# if defined(__clang__)
25+# if defined(__has_include)
2626 # if __has_include( <type_traits> ) && IUTEST_HAS_CXX11
2727 # define IUTEST_HAS_HDR_TYPETARITS 1
2828 # endif
--- trunk/include/iutest_ver.hpp (revision 1361)
+++ trunk/include/iutest_ver.hpp (revision 1362)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01169911u //!< iutest version 1.16.99.11
20+#define IUTEST_VER 0x01169912u //!< iutest version 1.16.99.12
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x16u //!< Minor Version
2323 #define IUTEST_MICROVER 0x99u //!< Micro Version
24-#define IUTEST_REVISION 0x11u //!< Revision
24+#define IUTEST_REVISION 0x12u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
@@ -123,7 +123,8 @@
123123 <li>v1.17.0.0
124124 <ul>
125125 <li></li>
126- <li><CSV パラメータ生成でファイルオープン失敗した場合の警告レベルを FATAL から WARNING に変更/li>
126+ <li>junit xml 出力で出力するテストが 0 だった場合にファイル書き出ししないように修正</li>
127+ <li>CSV パラメータ生成でファイルオープン失敗した場合の警告レベルを FATAL から WARNING に変更/li>
127128 <li>CSV パラメータ生成で要素がなかった場合に WARNING 出力</li>
128129 <li>deprecated: IUTEST_USE_OWN_LIST</li>
129130 </ul>
旧リポジトリブラウザで表示