• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1314 (tree)
Time2018-04-17 09:50:30
Authorsrz_zumix

Log Message

fix wraning

git@556ce26e33b344d4b558a8d4fb97a84de123c373
https://github.com/srz-zumix/iutest/commit/556ce26e33b344d4b558a8d4fb97a84de123c373


fix warning

git@8cbe02ed0c92725d2ed0ce8577b5bd04de088dd9


fix warning

git@86b6984c0322d2c25b9fefd5d39270bdaca292a3


revert pragma position

git@11369caf1db269a6b4614e4679d4ec12ceb5762f


fix wd number

git@cd297a9f1ca7d03b4d3090079ac8654b3c65522d


cmake msvc option update

git@b625bc9d218f209c1958357c15517311c8ee30ab


move pragma warning disable

git@cea925fd28b6d9353ddd322069cd4a4d8409db18


move pragma warning disable

git@a8f81034889a6aa54e76e7a330291e049483465a


add cxxflag log

git@1d6ee5fddfb84c0189b485eb15fd56d89e37eceb


fix cpplint

git@2a79f1c0d36e4205d09eddf44e35012191ab8956


Update iutest_port.hpp
git@c6f84883a078fbca23921ad0bb7ec6bb6954ca8e


fix test
git@5dae829019f10730e435654c1512e05a5baf5d77


add charcode tests

git@2945111e877ac01ef2dad8618a5fc47fcc0368de


fix warning

git@625fee15af4c49de56c1753069e63187a46d29e3


add /wx option

git@99b64e52c42143ec2dd4bb58dce298a1a97c9361


Merge pull request #52 from srz-zumix/feature/cirrus-ci

Create .cirrus.yml
git@18278e9787c304b6b9472f5f5d1cbaff5b835bfb


update README and comment out use_gtest_task

git@db074504a6de3aac7d186583ae640fc9a31ddd83


update test

git@60377476c1b0e0702b4870b28d5bfa23218aacdf


add c++2a

git@e2c6dc224255775a015141680c7e6f1ec088acb7


spacing

git@3c7b6f641aa58a5cd1a2fdca20d9f931ff1a06ef


Create .cirrus.yml
git@66f39344207846d6cac64bfe3848c6a87f68288c

Change Summary

Incremental Difference

--- trunk/projects/cmake/CMakeLists.txt (revision 1313)
+++ trunk/projects/cmake/CMakeLists.txt (revision 1314)
@@ -121,6 +121,7 @@
121121 cxx_executable_test(assume_tests)
122122 cxx_executable_test(break_on_failure_nobreak_tests)
123123 cxx_executable_test(catch_exceptions_tests)
124+ cxx_executable_test(charcode_tests)
124125 cxx_executable_test(commandline_tests)
125126 cxx_executable_test(csvparams_tests)
126127 cxx_executable_test(cxx_feature_tests)
@@ -241,6 +242,7 @@
241242 cxx_add_test(assume_tests)
242243 cxx_add_test(break_on_failure_nobreak_tests)
243244 cxx_add_test(catch_exceptions_tests)
245+ cxx_add_test(charcode_tests)
244246 cxx_add_test(commandline_tests)
245247 cxx_add_test(csvparams_tests)
246248 cxx_add_test(disabled_tests)
--- trunk/README.md (revision 1313)
+++ trunk/README.md (revision 1314)
@@ -8,7 +8,8 @@
88 [![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)
99 [![Bitrise Build Status](https://www.bitrise.io/app/a1525fe176d85f53/status.svg?token=C67enKOhen9rjw_Cl37ihA&branch=master)](https://www.bitrise.io/app/a1525fe176d85f53)
1010 [![CircleCI](https://circleci.com/gh/srz-zumix/iutest/tree/master.svg?style=svg)](https://circleci.com/gh/srz-zumix/iutest/tree/master)
11-[![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)
11+[![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)
12+[![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=master)](https://cirrus-ci.com/github/srz-zumix/iutest/master)
1213 [![INSPECODE 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)
1314 [![Rocro INSPECODE Report](https://inspecode.rocro.com/badges/github.com/srz-zumix/iutest/report?token=wt0KUnRUG1-Ul2mLrg8ComR1RznZV3VoXecBJHW0EIk&branch=master)](https://inspecode.rocro.com/reports/github.com/srz-zumix/iutest/branch/master/summary)
1415 [![Coverage Status](https://coveralls.io/repos/github/srz-zumix/iutest/badge.svg?branch=master)](https://coveralls.io/github/srz-zumix/iutest?branch=master)
@@ -112,6 +113,7 @@
112113 |Bitrise |[![Bitrise Build Status](https://www.bitrise.io/app/a1525fe176d85f53/status.svg?token=C67enKOhen9rjw_Cl37ihA&branch=master)](https://www.bitrise.io/app/a1525fe176d85f53)|[![Bitrise Build Status](https://www.bitrise.io/app/a1525fe176d85f53/status.svg?token=C67enKOhen9rjw_Cl37ihA&branch=develop)](https://www.bitrise.io/app/a1525fe176d85f53)|iOS|
113114 | |[![Build Status](https://www.bitrise.io/app/aefa67ee488094b1/status.svg?token=aDrRgkZEmNFmsDjBM9fWTw&branch=master)](https://www.bitrise.io/app/aefa67ee488094b1)|[![Build Status](https://www.bitrise.io/app/aefa67ee488094b1/status.svg?token=aDrRgkZEmNFmsDjBM9fWTw&branch=develop)](https://www.bitrise.io/app/aefa67ee488094b1)|Android|
114115 |CircleCI |[![CircleCI](https://circleci.com/gh/srz-zumix/iutest/tree/master.svg?style=svg)](https://circleci.com/gh/srz-zumix/iutest/tree/master)|[![CircleCI](https://circleci.com/gh/srz-zumix/iutest/tree/develop.svg?style=svg)](https://circleci.com/gh/srz-zumix/iutest/tree/develop)|Optimize options test|
116+|Cirrus CI |[![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=master)](https://cirrus-ci.com/github/srz-zumix/iutest/master)|[![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=develop)](https://cirrus-ci.com/github/srz-zumix/iutest/develop)|g++ std=c++14,17...|
115117 |Scrutinizer|[![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|
116118 |INSPECODE |[![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|
117119
--- trunk/test/CommonMakefile.in (revision 1313)
+++ trunk/test/CommonMakefile.in (revision 1314)
@@ -77,6 +77,7 @@
7777 assume_tests \
7878 break_on_failure_nobreak_tests \
7979 catch_exceptions_tests \
80+ charcode_tests \
8081 commandline_tests \
8182 csvparams_tests \
8283 cxx_feature_tests \
--- trunk/test/assume_tests.cpp (revision 1313)
+++ trunk/test/assume_tests.cpp (revision 1314)
@@ -17,6 +17,8 @@
1717 // include
1818 #include "../include/gtest/iutest_spi_switch.hpp"
1919
20+IUTEST_PRAGMA_UNREACHCODE_WARN_DISABLE_BEGIN()
21+
2022 static int assume_test_var_a=0;
2123 static int assume_test_var_b=1;
2224
@@ -128,6 +130,8 @@
128130
129131 #endif
130132
133+IUTEST_PRAGMA_UNREACHCODE_WARN_DISABLE_END()
134+
131135 #if IUTEST_HAS_EXCEPTIONS
132136 static const int assume_throw_test_count = 7;
133137 #else
@@ -164,4 +168,3 @@
164168 printf("*** Successful ***\n");
165169 return 0;
166170 }
167-
--- trunk/test/filter_file_invalid_path_tests.cpp (revision 1313)
+++ trunk/test/filter_file_invalid_path_tests.cpp (revision 1314)
@@ -57,6 +57,6 @@
5757 (void)argc;
5858 (void)argv;
5959 printf("*** FILTER_FILE_TEST=0 ***\n");
60+ return 0;
6061 #endif
61- return 0;
6262 }
--- trunk/test/flagfile_invalid_path_tests.cpp (revision 1313)
+++ trunk/test/flagfile_invalid_path_tests.cpp (revision 1314)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2015-2016, Takazumi Shirayanagi\n
9+ * Copyright (C) 2015-2018, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -58,6 +58,6 @@
5858 (void)argc;
5959 (void)argv;
6060 printf("*** FLAGFILE_TEST=0 ***\n");
61+ return 0;
6162 #endif
62- return 0;
6363 }
--- trunk/test/unit_tests.cpp (revision 1313)
+++ trunk/test/unit_tests.cpp (revision 1314)
@@ -127,6 +127,7 @@
127127
128128 class HackXmlGeneratorListener : public ::iutest::DefaultXmlGeneratorListener
129129 {
130+ HackXmlGeneratorListener() : ::iutest::DefaultXmlGeneratorListener("") {}
130131 public:
131132 using DefaultXmlGeneratorListener::EscapeXmlAttribute;
132133 using DefaultXmlGeneratorListener::EscapeXmlText;
--- trunk/test/charcode_tests.cpp (revision 0)
+++ trunk/test/charcode_tests.cpp (revision 1314)
@@ -0,0 +1,36 @@
1+//======================================================================
2+//-----------------------------------------------------------------------
3+/**
4+ * @file charcode_tests.cpp
5+ * @brief iutest charcode test
6+ *
7+ * @author t.shirayanagi
8+ * @par copyright
9+ * Copyright (C) 2018, Takazumi Shirayanagi\n
10+ * The new BSD License is applied to this software.
11+ * see LICENSE
12+*/
13+//-----------------------------------------------------------------------
14+//======================================================================
15+
16+//======================================================================
17+// include
18+#include "iutest.hpp"
19+
20+#if defined(_MSC_VER)
21+IUTEST(CharCodeTest, UTF8ToSJIS)
22+{
23+ (void)iutest::detail::UTF8ToSJIS("test");
24+}
25+#endif
26+
27+#ifdef UNICODE
28+int wmain(int argc, wchar_t* argv[])
29+#else
30+int main(int argc, char* argv[])
31+#endif
32+{
33+ IUTEST_INIT(&argc, argv);
34+ return IUTEST_RUN_ALL_TESTS();
35+}
36+
--- trunk/include/iutest_matcher.hpp (revision 1313)
+++ trunk/include/iutest_matcher.hpp (revision 1314)
@@ -1979,7 +1979,7 @@
19791979 template<typename T, typename U>
19801980 detail::TypedEqMatcher<T> TypedEq(const U& expected)
19811981 {
1982- return detail::TypedEqMatcher<T>(expected);
1982+ return detail::TypedEqMatcher<T>(static_cast<T>(expected));
19831983 }
19841984
19851985 /**
--- trunk/include/internal/iutest_port.hpp (revision 1313)
+++ trunk/include/internal/iutest_port.hpp (revision 1314)
@@ -280,8 +280,6 @@
280280 class IUStreamBuffer
281281 {
282282 public:
283- IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
284-
285283 explicit IUStreamBuffer(FILE* fp)
286284 : m_fp(fp)
287285 {
@@ -292,12 +290,12 @@
292290
293291 ~IUStreamBuffer()
294292 {
293+IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
295294 fflush(m_fp);
296295 setbuf(m_fp, NULL);
296+IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
297297 }
298298
299- IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
300-
301299 public:
302300 ::std::string GetStreamString() { return m_buf; }
303301
--- trunk/include/internal/iutest_pragma.hpp (revision 1313)
+++ trunk/include/internal/iutest_pragma.hpp (revision 1314)
@@ -134,8 +134,19 @@
134134 # define IUTEST_PRAGMA_UNUSED_LOCAL_TYPEDEFS_WARN_DISABLE_END() \
135135 IUTEST_PRAGMA_WARN_POP()
136136 #else
137+# define IUTEST_PRAGMA_UNUSED_LOCAL_TYPEDEFS_WARN_DISABLE_BEGIN()
138+# define IUTEST_PRAGMA_UNUSED_LOCAL_TYPEDEFS_WARN_DISABLE_END()
137139 #endif
138140
141+#if defined(_MSC_VER)
142+# define IUTEST_PRAGMA_UNREACHCODE_WARN_DISABLE_BEGIN() IUTEST_PRAGMA_MSC_WARN_PUSH() \
143+ IUTEST_PRAGMA_MSC_WARN_DISABLE(4702)
144+# define IUTEST_PRAGMA_UNREACHCODE_WARN_DISABLE_END() IUTEST_PRAGMA_MSC_WARN_POP()
145+#else
146+# define IUTEST_PRAGMA_UNREACHCODE_WARN_DISABLE_BEGIN()
147+# define IUTEST_PRAGMA_UNREACHCODE_WARN_DISABLE_END()
148+#endif
149+
139150 #if defined(_MSC_VER) && _MSC_VER < 1700
140151 # define IUTEST_PRAGMA_EXTERN_TEMPLATE_WARN_DISABLE_BEGIN() IUTEST_PRAGMA_MSC_WARN_PUSH() \
141152 IUTEST_PRAGMA_MSC_WARN_DISABLE(4231)
--- trunk/include/iutest_ver.hpp (revision 1313)
+++ trunk/include/iutest_ver.hpp (revision 1314)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01160213u //!< iutest version 1.16.2.13
20+#define IUTEST_VER 0x01160214u //!< iutest version 1.16.2.14
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x16u //!< Minor Version
2323 #define IUTEST_MICROVER 0x02u //!< Micro Version
24-#define IUTEST_REVISION 0x13u //!< Revision
24+#define IUTEST_REVISION 0x14u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
Show on old repository browser