• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1399 (tree)
Zeit2019-11-22 12:45:44
Autorsrz_zumix

Log Message

Merge pull request #341 from srz-zumix/develop

v1.17.0.1
git@0a5f814c0197bf87904295961e5c851d468cedfb
https://github.com/srz-zumix/iutest/commit/0a5f814c0197bf87904295961e5c851d468cedfb


Create feature_request.md
git@fa7d1781f99029b5b35648d4e892646499450c6a

Ändern Zusammenfassung

Diff

--- trunk/CHANGES.md (revision 1398)
+++ trunk/CHANGES.md (revision 1399)
@@ -5,6 +5,13 @@
55 ## Changes for 1.17.0
66
77 * New
8+ * GTEST_SKIP 対応
9+
10+--------------------------------------------------
11+
12+## Changes for 1.17.0
13+
14+* New
815 * ::std::string_view 対応
916 * ::std::filesystem 対応
1017 * FreeBSD 対応
--- trunk/codefresh.yml (revision 1398)
+++ trunk/codefresh.yml (revision 1399)
@@ -33,8 +33,8 @@
3333 stage: prepare
3434 image: gcc:9
3535 commands:
36- # - cf_export GGC_MIN_EXPAND=4
37- # - cf_export GGC_MIN_HEAPSIZ=32768
36+ - cf_export GGC_MIN_EXPAND=4
37+ - cf_export GGC_MIN_HEAPSIZ=32768
3838 - cf_export CI_NODEBUG=1
3939 - make -C test clean
4040 - make -C test prepare
--- trunk/include/gtest/iutest_gmock_ver.hpp (revision 1398)
+++ trunk/include/gtest/iutest_gmock_ver.hpp (revision 1399)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2014-2018, Takazumi Shirayanagi\n
9+ * Copyright (C) 2014-2019, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -26,9 +26,11 @@
2626
2727 //!< Minor Version
2828 #ifndef GMOCK_MINORVER
29-# if !defined(GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_)
30-# define GMOCK_MINORVER 0x08
29+# if defined(GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT)
30+# define GMOCK_MINORVER 0x10
3131 # define GMOCK_LATEST 1
32+# elif defined(GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_)
33+# define GMOCK_MINORVER 0x10
3234 # elif defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_)
3335 # define GMOCK_MINORVER 0x08
3436 # elif defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_)
--- trunk/include/gtest/iutest_gtest_ver.hpp (revision 1398)
+++ trunk/include/gtest/iutest_gtest_ver.hpp (revision 1399)
@@ -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 */
@@ -27,9 +27,11 @@
2727
2828 //!< Minor Version
2929 #ifndef GTEST_MINORVER
30-# if !defined(GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_)
31-# define GTEST_MINORVER 0x08
30+# if defined(GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_)
31+# define GTEST_MINORVER 0x10
3232 # define GTEST_LATEST 1
33+# elif defined(GTEST_SKIP)
34+# define GTEST_MINORVER 0x10
3335 # elif defined(GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_)
3436 # define GTEST_MINORVER 0x08
3537 # elif !defined(RUN_ALL_TESTS) && !defined(GTEST_CREF_WORKAROUND_)
--- trunk/include/gtest/switch/iutest_switch_skip.hpp (revision 1398)
+++ trunk/include/gtest/switch/iutest_switch_skip.hpp (revision 1399)
@@ -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 */
@@ -19,23 +19,26 @@
1919
2020 //======================================================================
2121 // define
22+#define GTEST_SKIP IUTEST_SKIP
2223
2324 #else // !defined(IUTEST_USE_GTEST)
2425
2526 //======================================================================
2627 // undef
27-#if defined(INCG_IRIS_IUTEST_HPP_)
28-
28+#if defined(IUTEST_SKIP)
2929 #undef IUTEST_SKIP
30-
3130 #endif
3231
3332 //======================================================================
3433 // define
35-#define IUTEST_SKIP() GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
36- if( ::testing::internal::AlwaysTrue() ) return GTEST_MESSAGE_("Skipped. ", ::testing::TestPartResult::kSuccess)
3734
35+#if !defined(GTEST_SKIP)
36+# define GTEST_SKIP() GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
37+ if( ::testing::internal::AlwaysTrue() ) return GTEST_MESSAGE_("Skipped. ", ::testing::TestPartResult::kSuccess)
38+#endif
3839
40+#define IUTEST_SKIP GTEST_SKIP
41+
3942 #endif // !defined(IUTEST_USE_GTEST)
4043
4144 #endif // INCG_IRIS_IUTEST_SWITCH_SKIP_HPP_3CFB2B8D_9C8D_4B4F_9843_2FE38126BB31_
--- trunk/include/iutest_ver.hpp (revision 1398)
+++ trunk/include/iutest_ver.hpp (revision 1399)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01170000u //!< iutest version 1.17.0.0
20+#define IUTEST_VER 0x01170001u //!< iutest version 1.17.0.1
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x17u //!< Minor Version
2323 #define IUTEST_MICROVER 0x00u //!< Micro Version
24-#define IUTEST_REVISION 0x00u //!< Revision
24+#define IUTEST_REVISION 0x01u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
@@ -121,6 +121,11 @@
121121 * @page CHANGELOG 変更履歴
122122 * @par Changes
123123 <ul>
124+ <li>v1.17.1.0
125+ <ul>
126+ <li>GTEST_SKIP 対応</li>
127+ </ul>
128+ </li>
124129 <li>v1.17.0.0
125130 <ul>
126131 <li>大きな配列/コンテナ/オブジェクトの pinter を修正</li>
--- trunk/test/syntax_gtest_tests.cpp (revision 1398)
+++ trunk/test/syntax_gtest_tests.cpp (revision 1399)
@@ -352,6 +352,12 @@
352352
353353 #endif
354354
355+TEST(GTestSyntaxTest, Skip)
356+{
357+ if( int x = 1 )
358+ GTEST_SKIP() << x;
359+}
360+
355361 #if IUTEST_HAS_EXCEPTIONS
356362
357363 namespace syntax_tests
--- trunk/test/syntax_tests.cpp (revision 1398)
+++ trunk/test/syntax_tests.cpp (revision 1399)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2013-2016, Takazumi Shirayanagi\n
9+ * Copyright (C) 2013-2019, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -450,6 +450,12 @@
450450
451451 #endif
452452
453+IUTEST(SyntaxTest, Skip)
454+{
455+ if( int x = 1 )
456+ IUTEST_SKIP() << x;
457+}
458+
453459 IUTEST(SyntaxTest, Pred1)
454460 {
455461 if( int x=1 )
Show on old repository browser